From fdc1faed2944c04a2ef39a3789738c5a53544ce1 Mon Sep 17 00:00:00 2001
From: mksafavi <mksafavi@gmail.com>
Date: Sun, 22 Dec 2024 21:21:09 +0330
Subject: [PATCH 01/76] conjure-tor: init at 0-unstable-2024-11-11

---
 pkgs/by-name/co/conjure-tor/package.nix | 29 +++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 pkgs/by-name/co/conjure-tor/package.nix

diff --git a/pkgs/by-name/co/conjure-tor/package.nix b/pkgs/by-name/co/conjure-tor/package.nix
new file mode 100644
index 000000000000..98794f2791c8
--- /dev/null
+++ b/pkgs/by-name/co/conjure-tor/package.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitLab,
+  nix-update-script,
+}:
+buildGoModule {
+  pname = "conjure-tor";
+  version = "0-unstable-2024-11-11";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.torproject.org";
+    owner = "tpo";
+    repo = "anti-censorship/pluggable-transports/conjure";
+    rev = "a773daab19928f37caf2ec4181f0da2e0d20d35a";
+    hash = "sha256-WC9QEgwhu7ynf2p8SXzMf8JNp6ZzF4S9Lk2SjUWj2lU=";
+  };
+
+  vendorHash = "sha256-vdcpNYa2gjacK0DMQ6VP9kX6f10JOHn8+Wr1Ql+lI7o=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/conjure";
+    description = "Refraction networking system that routes traffic to endpoints in an ISP's unused IP address space";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ mksafavi ];
+  };
+}

From c7d4a8e231555d22ce7d6347cdeb761ee638705f Mon Sep 17 00:00:00 2001
From: Viktor Illmer <1476338+v-ji@users.noreply.github.com>
Date: Tue, 7 Jan 2025 17:04:20 +0100
Subject: [PATCH 02/76] maintainers: add vji

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3e1a1e1cbcfe..c6461a2e5ad9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -24056,6 +24056,12 @@
     githubId = 7444430;
     name = "Radik Islamov";
   };
+  vji = {
+    email = "mail@viktor.im";
+    github = "v-ji";
+    githubId = 1476338;
+    name = "Viktor Illmer";
+  };
   vklquevs = {
     email = "vklquevs@gmail.com";
     github = "vklquevs";

From 0e3fb02a34258371d27e5804db57992e1d16df10 Mon Sep 17 00:00:00 2001
From: Mika Tammi <mikatammi@gmail.com>
Date: Mon, 11 Nov 2024 09:47:08 +0200
Subject: [PATCH 03/76] python3Packages.diffusers: 0.30.3 -> 0.31.0

Diff: https://github.com/huggingface/diffusers/compare/refs/tags/v0.30.3...v0.31.0

Changelog: https://github.com/huggingface/diffusers/releases/tag/v0.31.0

Signed-off-by: Mika Tammi <mikatammi@gmail.com>
---
 pkgs/development/python-modules/diffusers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/diffusers/default.nix b/pkgs/development/python-modules/diffusers/default.nix
index 1c042fef1c92..5d71a3b96d37 100644
--- a/pkgs/development/python-modules/diffusers/default.nix
+++ b/pkgs/development/python-modules/diffusers/default.nix
@@ -40,7 +40,7 @@
 
 buildPythonPackage rec {
   pname = "diffusers";
-  version = "0.30.3";
+  version = "0.31.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     owner = "huggingface";
     repo = "diffusers";
     tag = "v${version}";
-    hash = "sha256-/3lHJdsNblKb6xX03OluSCApMK3EXJbRLboBk8CjobE=";
+    hash = "sha256-5Kav5ZcSYLYH2ojGRFAGyyK7NC8Ny99odVPSpVI4atU=";
   };
 
   build-system = [ setuptools ];

From 3ee5dbcd66bd6c64c17eb167c111336459d2c8cb Mon Sep 17 00:00:00 2001
From: iko <mail@iko.soy>
Date: Thu, 9 Jan 2025 14:43:23 +0300
Subject: [PATCH 04/76] parseable: init at 1.7.1

Apply suggestions from code review

Co-authored-by: Felix Bargfeldt <41747605+Defelo@users.noreply.github.com>
---
 pkgs/by-name/pa/parseable/package.nix | 51 +++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 pkgs/by-name/pa/parseable/package.nix

diff --git a/pkgs/by-name/pa/parseable/package.nix b/pkgs/by-name/pa/parseable/package.nix
new file mode 100644
index 000000000000..d501c1f4e6dd
--- /dev/null
+++ b/pkgs/by-name/pa/parseable/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  rdkafka,
+  pkg-config,
+  fetchFromGitHub,
+  rustPlatform,
+  fetchzip,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "parseable";
+  version = "1.7.1";
+
+  src = fetchFromGitHub {
+    owner = "parseablehq";
+    repo = "parseable";
+    tag = "v${version}";
+    hash = "sha256-Uoejniv6hUpxTZ6gosP+LHTo4FD+o1AlUEWopdpz5M0=";
+  };
+
+  LOCAL_ASSETS_PATH = fetchzip {
+    url = "https://github.com/parseablehq/console/releases/download/v0.9.15/build.zip";
+    hash = "sha256-T37pI7adfKPDkCETcGcZVzcYVcxROSZLDrFhV4XO4tc=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-rT/ORTOPsOgYlS8VCMBXo/cjfSJYcCtJofcPEIlc/cI=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ rdkafka ];
+
+  buildFeatures = [ "rdkafka/dynamic-linking" ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Disk less, cloud native database for logs, observability, security, and compliance";
+    homepage = "https://www.parseable.com";
+    changelog = "https://github.com/parseablehq/parseable/releases/tag/v${version}";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ ilyakooo0 ];
+    mainProgram = "parseable";
+  };
+}

From ee0eae58c039cde0afd11a7a87e72772dd80629d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Sat, 18 Jan 2025 21:39:24 +0100
Subject: [PATCH 05/76] openvpn: fix sandboxed darwin build

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

diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index a10eec9cd2ca..024545a57c27 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -15,6 +15,7 @@
   pkcs11Support ? false,
   pkcs11helper,
   nixosTests,
+  unixtools,
 }:
 
 let
@@ -29,7 +30,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-HGEP3etobjTxNnw0fgJ+QY4HUjoQ9NjOSiwq8vYaGSk=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs =
+    [ pkg-config ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      unixtools.route
+      unixtools.ifconfig
+    ];
 
   buildInputs =
     [

From 7f5e8c93019c850cfd0f70e130323bc7c5d96001 Mon Sep 17 00:00:00 2001
From: Pedro Alves <pta2002@pta2002.com>
Date: Tue, 21 Jan 2025 10:07:04 +0000
Subject: [PATCH 06/76] jellyseerr: 2.2.3 -> 2.3.0

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

diff --git a/pkgs/by-name/je/jellyseerr/package.nix b/pkgs/by-name/je/jellyseerr/package.nix
index eb6f823e52d2..8dc6b38af942 100644
--- a/pkgs/by-name/je/jellyseerr/package.nix
+++ b/pkgs/by-name/je/jellyseerr/package.nix
@@ -4,30 +4,30 @@
   fetchFromGitHub,
   stdenv,
   makeWrapper,
-  nodejs_20,
+  nodejs_22,
   python3,
   sqlite,
   nix-update-script,
 }:
 
 let
-  nodejs = nodejs_20;
+  nodejs = nodejs_22;
   pnpm = pnpm_9.override { inherit nodejs; };
 in
 stdenv.mkDerivation rec {
   pname = "jellyseerr";
-  version = "2.2.3";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "Fallenbagel";
     repo = "jellyseerr";
     rev = "v${version}";
-    hash = "sha256-JkbmCyunaMngAKUNLQHxfa1pktXxTjeL6ngvIgiAsGo=";
+    hash = "sha256-vAMuiHcf13CDyOB0k36DXUk+i6K6h/R7dmBLJsMkzNA=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit pname version src;
-    hash = "sha256-1r2+aeRb6zdpqqimufibVRjeAdvwHL0GiQSu5pHBh+U=";
+    hash = "sha256-iSzs+lMQzcFjUz4K3rYP0I6g/wVz6u49FSQuPHXbVRM=";
   };
 
   buildInputs = [ sqlite ];

From 81186b50bf3d159398b0a37d12774e7681d9754c Mon Sep 17 00:00:00 2001
From: Pedro Alves <pta2002@pta2002.com>
Date: Tue, 21 Jan 2025 10:11:36 +0000
Subject: [PATCH 07/76] jellyseerr: update conventions

---
 pkgs/by-name/je/jellyseerr/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/je/jellyseerr/package.nix b/pkgs/by-name/je/jellyseerr/package.nix
index 8dc6b38af942..1783f4f7aa5c 100644
--- a/pkgs/by-name/je/jellyseerr/package.nix
+++ b/pkgs/by-name/je/jellyseerr/package.nix
@@ -14,19 +14,19 @@ let
   nodejs = nodejs_22;
   pnpm = pnpm_9.override { inherit nodejs; };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "jellyseerr";
   version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "Fallenbagel";
     repo = "jellyseerr";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-vAMuiHcf13CDyOB0k36DXUk+i6K6h/R7dmBLJsMkzNA=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
-    inherit pname version src;
+    inherit (finalAttrs) pname version src;
     hash = "sha256-iSzs+lMQzcFjUz4K3rYP0I6g/wVz6u49FSQuPHXbVRM=";
   };
 
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Fork of overseerr for jellyfin support";
     homepage = "https://github.com/Fallenbagel/jellyseerr";
     longDescription = ''
@@ -79,9 +79,9 @@ stdenv.mkDerivation rec {
       requests for your media library. It is a a fork of Overseerr built to
       bring support for Jellyfin & Emby media servers!
     '';
-    license = licenses.mit;
-    maintainers = with maintainers; [ camillemndn ];
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.camillemndn ];
+    platforms = lib.platforms.linux;
     mainProgram = "jellyseerr";
   };
-}
+})

From 1e4b1317973170dfec0e6fc010e1528ba6120acb Mon Sep 17 00:00:00 2001
From: Joeal Subash <joeal.subash@cern.ch>
Date: Thu, 5 Dec 2024 02:50:53 +0000
Subject: [PATCH 08/76] maintainers: add bashsu

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8aea451f3a0a..a63723026d71 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2582,6 +2582,12 @@
     name = "Wanderson Ferreira";
     keys = [ { fingerprint = "A3E1 C409 B705 50B3 BF41  492B 5684 0A61 4DBE 37AE"; } ];
   };
+  bashsu = {
+    name = "Joeal Subash";
+    email = "joeal.subash@cern.ch";
+    github = "joealsubash";
+    githubId = 98759349;
+  };
   bastaynav = {
     name = "Ivan Bastrakov";
     email = "bastaynav@proton.me";

From 1d049a42f1d28a983cf1a408677b4f3f442d0e4f Mon Sep 17 00:00:00 2001
From: Joeal Subash <joeal.subash@cern.ch>
Date: Wed, 20 Nov 2024 16:44:05 +0000
Subject: [PATCH 09/76] ipbus-uhal: init at 2.8.16

Co-authored-by: aucub <78630225+aucub@users.noreply.github.com>

ipbus-uhal: init at 2.8.16 : removed old git source; not using "with lib" anymore; empty maintainers added

Co-authored-by: Leah Amelia Chen <github@acc.pluie.me>

Co-authored-by: Leah Amelia Chen <github@acc.pluie.me>

ipbus-uhal: init at 2.8.16 - remove pkgs.distutils and enableParallelBuilding

ipbus-uhal: init at 2.8.16 - re-add python3.pkgs.distutil after local build failure, fixed after adding

adding suggestions by FliegendeWurst

undoing some changes to allow installation; installation did'nt work with previous commit

fixing merge conflict

Co-authored-by: Arne Keller <arne.keller@posteo.de>

fix multiple strings

pre and postInstall hooks added

removing python stuff.

remove python stuff

using new shorthand

patching in pacakge.nix instead

changes to fix error when testing

removing unecessary patch

usign new tag format for fetchFromGitHub

sticking to boost1.86; ipbus-uhal ioservice dependence

Fixing Formatting using nixpkgs
---
 pkgs/by-name/ip/ipbus-uhal/package.nix | 74 ++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 pkgs/by-name/ip/ipbus-uhal/package.nix

diff --git a/pkgs/by-name/ip/ipbus-uhal/package.nix b/pkgs/by-name/ip/ipbus-uhal/package.nix
new file mode 100644
index 000000000000..52292115695d
--- /dev/null
+++ b/pkgs/by-name/ip/ipbus-uhal/package.nix
@@ -0,0 +1,74 @@
+{
+  lib,
+  stdenv,
+  bash,
+  cacert,
+  boost186,
+  pugixml,
+  python3,
+  python3Packages,
+  fetchFromGitHub,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ipbus-uhal";
+  version = "2.8.16";
+  src = fetchFromGitHub {
+    owner = "ipbus";
+    repo = "ipbus-software";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-R+a9VmONyWh3BEYoMjRcXKv+3HaNcKbJDnYH1hXHdPg=";
+  };
+
+  nativeBuildInputs = [
+    cacert
+    (python3.withPackages (ps: [
+      ps.distutils
+      ps.pybind11
+    ]))
+  ];
+  buildInputs = [
+    boost186
+    pugixml
+    python3.pkgs.distutils
+    python3.pkgs.pybind11
+  ];
+  postPatch = ''
+    substituteInPlace config/Makefile.macros --replace-fail \
+      'SHELL := /bin/bash' ""
+    patchShebangs --build uhal/config/install.sh
+    patchShebangs --build uhal/tests/setup.sh
+    patchShebangs --build scripts/doxygen/api_uhal.sh
+    patchShebangs --build config/progress.sh
+    patchShebangs --build config/Makefile.macros
+  '';
+
+  enableParallelBuilding = true;
+
+  makeFlags = [
+    "Set=uhal"
+    "CXX=${stdenv.cc.targetPrefix}c++"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/{bin,include}
+    make Set=uhal install prefix=$out/bin includedir=$out/include
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Software which pairs with ipbus-firmware";
+    longDescription = ''
+      Software that provide a reliable high-performance
+      control link for particle-physics or other electronics,
+      by implementing a simple A32/D32 control protocol
+      for reading and modifying memory-mapped resources
+      within FPGA-based hardware devices.
+    '';
+    platforms = lib.platforms.linux;
+    homepage = "https://ipbus.web.cern.ch/";
+    maintainers = [ lib.maintainers.bashsu ];
+    mainProgram = "ipbus-uhal";
+  };
+})

From 814e95f1f5902a4eb513b2a13d8797a884a19f5c Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 23 Jan 2025 22:21:13 +0100
Subject: [PATCH 10/76] mysql80: 8.0.40 -> 8.0.41

Changes:
https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-41.html

Fixes:
* CVE-2024-11053
* CVE-2025-21500
* CVE-2025-21501
* CVE-2025-21518
* CVE-2025-21497
* CVE-2025-21555
* CVE-2025-21559
* CVE-2025-21540
* CVE-2025-21490
* CVE-2025-21491
* CVE-2025-21503
* CVE-2025-21523
* CVE-2025-21531
* CVE-2025-21505
* CVE-2025-21529
* CVE-2025-21543
* CVE-2025-21519
* CVE-2025-21546
* CVE-2025-21520
---
 pkgs/servers/sql/mysql/8.0.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix
index 4ab28170e231..50562124a2e3 100644
--- a/pkgs/servers/sql/mysql/8.0.x.nix
+++ b/pkgs/servers/sql/mysql/8.0.x.nix
@@ -31,11 +31,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mysql";
-  version = "8.0.40";
+  version = "8.0.41";
 
   src = fetchurl {
     url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz";
-    hash = "sha256-At/ZQ/lnQvf5zXiFWzJwjqTfVIycFK+Sc4F/O72dIrI=";
+    hash = "sha256-AV0gj3OOKfRjQr9i4Hq1Oxg/MEQq/YE1SnkxrSP+jPc=";
   };
 
   nativeBuildInputs = [

From a60170ab043a71919758155d8066e59f486759c5 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 23 Jan 2025 22:21:37 +0100
Subject: [PATCH 11/76] mysql84: 8.4.3 -> 8.4.4

Changes:
https://dev.mysql.com/doc/relnotes/mysql/8.4/en/news-8-4-4.html

Fixes:
* CVE-2024-11053
* CVE-2025-21500
* CVE-2025-21501
* CVE-2025-21518
* CVE-2025-21497
* CVE-2025-21555
* CVE-2025-21559
* CVE-2025-21540
* CVE-2025-21490
* CVE-2025-21491
* CVE-2025-21503
* CVE-2025-21523
* CVE-2025-21531
* CVE-2025-21505
* CVE-2025-21529
* CVE-2025-21543
* CVE-2025-21519
* CVE-2025-21546
* CVE-2025-21520
* CVE-2025-21499
* CVE-2025-21493
---
 pkgs/by-name/my/mysql84/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/my/mysql84/package.nix b/pkgs/by-name/my/mysql84/package.nix
index 075c39763ae7..bdddda7e3124 100644
--- a/pkgs/by-name/my/mysql84/package.nix
+++ b/pkgs/by-name/my/mysql84/package.nix
@@ -27,11 +27,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mysql";
-  version = "8.4.3";
+  version = "8.4.4";
 
   src = fetchurl {
     url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz";
-    hash = "sha256-eslWTEeAIvcwBf+Ju7QPZ7OB/AbVUYQWvf/sdeYluBg=";
+    hash = "sha256-+ykO90iJRDQIUknDG8pSrHGFMSREarIYuzvFAr8AgqU=";
   };
 
   nativeBuildInputs = [

From e22889171fe4b6cf0ec120286972e5e902217ced Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Sun, 8 Dec 2024 22:36:20 +0100
Subject: [PATCH 12/76] mumble: 1.5.634 -> 1.5.735

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/applications/networking/mumble/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 8131243ef262..ddca7c3bad51 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -108,24 +108,16 @@ let
   } source;
 
   source = rec {
-    version = "1.5.634";
+    version = "1.5.735";
 
     # Needs submodules
     src = fetchFromGitHub {
       owner = "mumble-voip";
       repo = "mumble";
       rev = "v${version}";
-      hash = "sha256-d9XmXHq264rTT80zphYcKLxS+AyUhjb19D3DuBJvMI4=";
+      hash = "sha256-JRnGgxkf5ct6P71bYgLbCEUmotDLS2Evy6t8R7ac7D4=";
       fetchSubmodules = true;
     };
-
-    patches = [
-      (fetchpatch {
-        name = "GCC14.patch";
-        url = "https://github.com/mumble-voip/mumble/commit/56945a9dfb62d29dccfe561572ebf64500deaed1.patch";
-        hash = "sha256-Frct9XJ/ZuHPglx+GB9h3vVycR8YY039dStIbfkPPDk=";
-      })
-    ];
   };
 in {
   mumble  = lib.recursiveUpdate (client source) {meta.mainProgram = "mumble";};

From e573e232ff92d342556d13596cbafa415177becf Mon Sep 17 00:00:00 2001
From: Esteban Macanek <75503218+EstebanMacanek@users.noreply.github.com>
Date: Fri, 24 Jan 2025 22:01:43 -0300
Subject: [PATCH 13/76] maintainers: add EstebanMacanek

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 49f0a66f0f79..79cce72a7dac 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7067,6 +7067,11 @@
     githubId = 16175276;
     keys = [ { fingerprint = "E4CE B0F0 B2EC 09A3 9678  F294 CC7A 7E3C 6CF3 1343"; } ];
   };
+  EstebanMacanek = {
+    name = "Esteban Macanek";
+    github = "EstebanMacanek";
+    githubId = 75503218;
+  };
   ethancedwards8 = {
     email = "ethan@ethancedwards.com";
     matrix = "@ethancedwards8:matrix.org";

From 3792c41da804209b4f3fb0eff400d83decae0b83 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@euank.com>
Date: Thu, 2 Jan 2025 14:56:36 +0900
Subject: [PATCH 14/76] python3Packages.manga-ocr: 0.1.13 -> 0.1.14

The numpy -> numpy2 change we added at build-time got incorperated
upstream and released as a new version already, so switch to that.

I'm doing this by hand rather than relying on the dependency bot because
we want to remove the postPatch I just added as well.
---
 .../python-modules/manga-ocr/default.nix            | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/manga-ocr/default.nix b/pkgs/development/python-modules/manga-ocr/default.nix
index 5c6c54975353..3b159b798f46 100644
--- a/pkgs/development/python-modules/manga-ocr/default.nix
+++ b/pkgs/development/python-modules/manga-ocr/default.nix
@@ -8,15 +8,14 @@ with python3Packages;
 
 buildPythonPackage rec {
   pname = "manga-ocr";
-  version = "0.1.13";
-  disabled = pythonOlder "3.7";
+  version = "0.1.14";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "kha-white";
     repo = "manga-ocr";
     tag = "v${version}";
-    hash = "sha256-0EwXDMnA9SCmSsMVXnMenSFSzs74lorFNNym9y/NNsI=";
+    hash = "sha256-fCLgFeo6GYPSpCX229TK2MXTKt3p1tQV06phZYD6UeE=";
   };
 
   build-system = [
@@ -37,15 +36,11 @@ buildPythonPackage rec {
     unidic-lite
   ];
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "numpy<2" "numpy"
-  '';
-
   meta = with lib; {
+    mainProgram = "manga_ocr";
     description = "Optical character recognition for Japanese text, with the main focus being Japanese manga";
     homepage = "https://github.com/kha-white/manga-ocr";
-    changelog = "https://github.com/kha-white/manga-ocr/releases/tag/${version}";
+    changelog = "https://github.com/kha-white/manga-ocr/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ laurent-f1z1 ];
   };

From 2fa5a892d9270fa8328c97c692e28f3b41c8c922 Mon Sep 17 00:00:00 2001
From: Tom Westerhout <14264576+twesterhout@users.noreply.github.com>
Date: Sun, 19 Jan 2025 19:58:44 +0000
Subject: [PATCH 15/76] halide: 18.0.0 -> 19.0.0

---
 pkgs/development/compilers/halide/default.nix | 130 ++++++++++++------
 pkgs/top-level/all-packages.nix               |   2 +-
 pkgs/top-level/python-packages.nix            |   2 +-
 3 files changed, 92 insertions(+), 42 deletions(-)

diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix
index a21fdd937d4d..3ce25abaf53c 100644
--- a/pkgs/development/compilers/halide/default.nix
+++ b/pkgs/development/compilers/halide/default.nix
@@ -4,6 +4,7 @@
   lib,
   fetchFromGitHub,
   cmake,
+  fetchpatch2,
   flatbuffers,
   libffi,
   libpng,
@@ -14,71 +15,116 @@
   openblas,
   blas,
   lapack,
+  removeReferencesTo,
+  ninja,
   pythonSupport ? false,
-  python3Packages ? null,
+  python3Packages,
+  wasmSupport ? false,
+  wabt,
+  doCheck ? true,
 }:
 
 assert blas.implementation == "openblas" && lapack.implementation == "openblas";
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "halide";
-  version = "18.0.0";
+  version = "19.0.0";
 
   src = fetchFromGitHub {
     owner = "halide";
     repo = "Halide";
-    rev = "v${version}";
-    hash = "sha256-BPalUh9EgdCqVaWC1HoreyyRcPQc4QMIYnLrRoNDDCI=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-0SFGX4G6UR8NS4UsdFOb99IBq2/hEkr/Cm2p6zkIh/8=";
   };
 
-  postPatch = ''
-    # See https://github.com/halide/Halide/issues/7785
-    substituteInPlace 'src/runtime/HalideRuntime.h' \
-      --replace '#if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__)
-    #define HALIDE_CPP_COMPILER_HAS_FLOAT16' \
-                '#if defined(__x86_64__) || defined(__i386__)
-    #define HALIDE_CPP_COMPILER_HAS_FLOAT16'
-  '';
+  patches = [
+    # The following two patches fix cmake/HalidePackageConfigHelpers.cmake to
+    # support specifying an absolute library install path (which is what Nix
+    # does when "lib" is included as a separate output)
+    (fetchpatch2 {
+      url = "https://github.com/halide/Halide/commit/ac2cd23951aff9ac3b765e51938f1e576f1f0ee9.diff?full_index=1";
+      hash = "sha256-JTktOTSyReDUEHTaPPMoi+/K/Gzg39i6MI97cO3654k=";
+    })
+    (fetchpatch2 {
+      url = "https://github.com/halide/Halide/commit/59f4fff30f4ab628da9aa7e5f77a7f1bb218a779.diff?full_index=1";
+      hash = "sha256-yOzE+1jai1w1GQisLYfu8F9pbTE/bYg0MTLq8rPXdGk=";
+    })
+  ];
+
+  postPatch =
+    ''
+      substituteInPlace src/runtime/CMakeLists.txt --replace-fail \
+          '-isystem "''${VulkanHeaders_INCLUDE_DIR}"' \
+          '-isystem "''${VulkanHeaders_INCLUDE_DIR}"
+           -isystem "${llvmPackages.clang}/resource-root/include"'
+    ''
+    # Upstream Halide include a check in their CMake files that forces Halide to
+    # link LLVM dynamically because of WebAssembly. It unnecessarily increases
+    # the closure size in cases when the WebAssembly target is not used. Hence,
+    # the following hack
+    + lib.optionalString (!wasmSupport) ''
+      substituteInPlace cmake/FindHalide_LLVM.cmake --replace-fail \
+          'if (comp STREQUAL "WebAssembly")' \
+          'if (FALSE)'
+    '';
 
   cmakeFlags = [
-    "-DWARNINGS_AS_ERRORS=OFF"
     "-DWITH_PYTHON_BINDINGS=${if pythonSupport then "ON" else "OFF"}"
-    "-DTARGET_WEBASSEMBLY=OFF"
+    (lib.cmakeBool "WITH_TESTS" doCheck)
+    (lib.cmakeBool "WITH_TUTORIALS" doCheck)
     # Disable performance tests since they may fail on busy machines
     "-DWITH_TEST_PERFORMANCE=OFF"
     # Disable fuzzing tests -- this has become the default upstream after the
     # v16 release (See https://github.com/halide/Halide/commit/09c5d1d19ec8e6280ccbc01a8a12decfb27226ba)
     # These tests also fail to compile on Darwin because of some missing command line options...
     "-DWITH_TEST_FUZZ=OFF"
-    # Disable FetchContent for flatbuffers and use the version from nixpkgs instead
-    "-DFLATBUFFERS_USE_FETCHCONTENT=OFF"
-    "-DPYBIND11_USE_FETCHCONTENT=OFF"
+    # Disable FetchContent and use versions from nixpkgs instead
+    "-DHalide_USE_FETCHCONTENT=OFF"
+    "-DHalide_WASM_BACKEND=${if wasmSupport then "wabt" else "OFF"}"
+    (lib.cmakeBool "Halide_LLVM_SHARED_LIBS" wasmSupport)
   ];
 
-  doCheck = true;
+  outputs = [
+    "out"
+    "lib"
+  ];
 
-  preCheck =
-    let
-      disabledTests = lib.strings.concatStringsSep "|" [
-        # Requires too much parallelism for remote builders.
-        "mullapudi2016_fibonacci"
-        # Take too long---we don't want to run these in CI.
-        "adams2019_test_apps_autoscheduler"
-        "anderson2021_test_apps_autoscheduler"
-        "correctness_cross_compilation"
-        "correctness_simd_op_check_hvx"
-      ];
-    in
-    ''
-      checkFlagsArray+=("ARGS=-E '${disabledTests}'")
-    '';
+  inherit doCheck;
 
-  postInstall = lib.optionalString pythonSupport ''
-    mkdir -p $out/${builtins.dirOf python3Packages.python.sitePackages}
-    mv -v $out/lib/python3/site-packages $out/${python3Packages.python.sitePackages}
-    rmdir $out/lib/python3/
+  disabledTests = [
+    # Requires too much parallelism for remote builders.
+    "mullapudi2016_fibonacci"
+    # Tests performance---flaky in CI
+    "mullapudi2016_reorder"
+    # Take too long---we don't want to run these in CI.
+    "adams2019_test_apps_autoscheduler"
+    "anderson2021_test_apps_autoscheduler"
+    "correctness_cross_compilation"
+    "correctness_simd_op_check_hvx"
+  ];
+  # ninja's setup-hook doesn't let us specify custom flags for the checkPhase, see
+  # https://discourse.nixos.org/t/building-only-specific-targets-with-cmake/31545/4
+  # so we resort to overriding the whole checkPhase
+  dontUseNinjaCheck = true;
+  checkPhase = ''
+    runHook preCheck
+    ctest --exclude-regex '^(${lib.strings.concatStringsSep "|" finalAttrs.disabledTests})$'
+    runHook postCheck
   '';
 
+  postInstall =
+    lib.optionalString pythonSupport ''
+      mkdir -p $lib/lib/${python3Packages.python.libPrefix}
+      mv -v $lib/lib/python3/site-packages $lib/lib/${python3Packages.python.libPrefix}
+      rmdir $lib/lib/python3/
+    ''
+    # Debug symbols in the runtime include references to clang, but they're not
+    # required for running the code. llvmPackages.clang increases the runtime
+    # closure by at least a GB which is a waste, so we remove references to clang.
+    + lib.optionalString (stdenv != llvmPackages.stdenv) ''
+      remove-references-to -t ${llvmPackages.clang} $lib/lib/libHalide*
+    '';
+
   # Note: only openblas and not atlas part of this Nix expression
   # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix
   # to get a hint howto setup atlas instead of openblas
@@ -97,12 +143,15 @@ stdenv.mkDerivation rec {
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
       libgbm
       libGL
-    ];
+    ]
+    ++ lib.optionals wasmSupport [ wabt ];
 
   nativeBuildInputs =
     [
       cmake
       flatbuffers
+      removeReferencesTo
+      ninja
     ]
     ++ lib.optionals pythonSupport [
       python3Packages.python
@@ -124,5 +173,6 @@ stdenv.mkDerivation rec {
       atila
       twesterhout
     ];
+    broken = !stdenv.buildPlatform.canExecute stdenv.hostPlatform;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7ba597d8c07..080715fa998c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3621,7 +3621,7 @@ with pkgs;
   hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { };
 
   halide = callPackage ../development/compilers/halide {
-    llvmPackages = llvmPackages_18;
+    llvmPackages = llvmPackages_19;
   };
 
   hareThirdParty = recurseIntoAttrs (callPackage ./hare-third-party.nix { });
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9dbb671c5b2b..ab024ea28bbc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5769,7 +5769,7 @@ self: super: with self; {
 
   hakuin = callPackage ../development/python-modules/hakuin { };
 
-  halide = toPythonModule (pkgs.halide.override { pythonSupport = true; python3Packages = self; });
+  halide = toPythonModule (pkgs.halide.override { pythonSupport = true; python3Packages = self; }).lib;
 
   halo = callPackage ../development/python-modules/halo { };
 

From e49163e2aaad0d78499f739d941505c55d173d3a Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Tue, 7 Jan 2025 00:38:31 +0800
Subject: [PATCH 16/76] basicswap: init at 0.14.3

---
 pkgs/by-name/ba/basicswap/package.nix | 104 ++++++++++++++++++++++++++
 1 file changed, 104 insertions(+)
 create mode 100644 pkgs/by-name/ba/basicswap/package.nix

diff --git a/pkgs/by-name/ba/basicswap/package.nix b/pkgs/by-name/ba/basicswap/package.nix
new file mode 100644
index 000000000000..e8ecd5a406db
--- /dev/null
+++ b/pkgs/by-name/ba/basicswap/package.nix
@@ -0,0 +1,104 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  linkFarm,
+  secp256k1,
+  particl-core,
+  bitcoind,
+  namecoind,
+  monero-cli,
+  wownero,
+}:
+
+let
+  secp256k1_anonswap = secp256k1.overrideAttrs (old: {
+    src = fetchFromGitHub {
+      owner = "tecnovert";
+      repo = "secp256k1";
+      rev = "fd8b63ccf8bcb48358a42c456f34e2488a55a688";
+      hash = "sha256-/bmKZRBBjirI4YqRKfzoxdAt6UVoWHmrNQQHX7l+eH8=";
+    };
+    configureFlags = old.configureFlags ++ [
+      "--enable-experimental"
+      "--enable-module-ed25519"
+      "--enable-module-generator"
+      "--enable-module-dleag"
+      "--enable-module-ecdsaotves"
+    ];
+  });
+  coincurve-anonswap =
+    (python3Packages.coincurve.override {
+      secp256k1 = secp256k1_anonswap;
+    }).overrideAttrs
+      (old: {
+        src = fetchFromGitHub {
+          owner = "tecnovert";
+          repo = "coincurve";
+          rev = "932366c9d4d8e487162b5c1b2a2d9693e24e0483";
+          hash = "sha256-zOekPmP1zR/S+zxq/7OrEz24k8SInlsB+wJ8kPlmqe4=";
+        };
+      });
+  bindir = linkFarm "bindir" (
+    lib.mapAttrs (_: p: "${lib.getBin p}/bin") {
+      particl = particl-core;
+      bitcoin = bitcoind;
+      namecoin = namecoind;
+      monero = monero-cli;
+      wownero = wownero;
+      #TODO: add pivx after it's not broken
+    }
+  );
+in
+python3Packages.buildPythonApplication rec {
+  pname = "basicswap";
+  version = "0.14.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "basicswap";
+    repo = "basicswap";
+    tag = "v${version}";
+    hash = "sha256-Ay7MQJdbPDjbtfaIWsegu01KIjlKQqdqH3MomYW7KGc=";
+  };
+
+  postPatch = ''
+    substituteInPlace basicswap/config.py --replace-fail 'os.path.join("~", ".basicswap", "bin")' '"${bindir}"'
+    substituteInPlace basicswap/bin/prepare.py \
+      --replace-fail "bin_dir = None" "bin_dir = '${bindir}'" \
+      --replace-fail "no_cores = False" "no_cores = True"
+  '';
+
+  build-system = with python3Packages; [
+    hatchling
+  ];
+
+  dependencies = with python3Packages; [
+    coincurve-anonswap
+    wheel
+    pyzmq
+    protobuf
+    sqlalchemy_1_4
+    python-gnupg
+    jinja2
+    pycryptodome
+    pysocks
+    mnemonic
+  ];
+
+  postInstall = ''
+    install -Dm755 scripts/createoffers.py $out/bin/basicswap-createoffers
+  '';
+
+  doCheck = false;
+
+  passthru.bindir = bindir;
+
+  meta = with lib; {
+    description = "Basic Atomic Swap Proof of Concept";
+    homepage = "https://basicswapdex.com";
+    license = licenses.mit;
+    maintainers = with maintainers; [ linsui ];
+    mainProgram = "basicswap-run";
+  };
+}

From ca840a01ced92c13606cb28a68bdc2f367452f9f Mon Sep 17 00:00:00 2001
From: DoctorDalek1963 <dyson.dyson@icloud.com>
Date: Tue, 28 Jan 2025 01:42:17 +0000
Subject: [PATCH 17/76] feishin: 1.12.1 -> 1.12.2

---
 pkgs/by-name/fe/feishin/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix
index dd6cd95f1837..4b7f91f5b05f 100644
--- a/pkgs/by-name/fe/feishin/package.nix
+++ b/pkgs/by-name/fe/feishin/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   buildNpmPackage,
   fetchFromGitHub,
-  electron_31,
+  electron_33,
   darwin,
   copyDesktopItems,
   makeDesktopItem,
@@ -11,22 +11,22 @@
 }:
 let
   pname = "feishin";
-  version = "0.12.1";
+  version = "0.12.2";
 
   src = fetchFromGitHub {
     owner = "jeffvli";
     repo = "feishin";
     rev = "v${version}";
-    hash = "sha256-UpNtRZhAqRq/sRVkgg/RbLUWNXvHkAyGhu29zWE6Lk0=";
+    hash = "sha256-2kWeUlOTAd1Usw/cLOARyLqxEzZRk27RuHjLwupnq80=";
   };
 
-  electron = electron_31;
+  electron = electron_33;
 in
 buildNpmPackage {
   inherit pname version;
 
   inherit src;
-  npmDepsHash = "sha256-0YfydhQZgxjMvZYosuS+rGA+9qzSYTLilQqMqlnR1oQ=";
+  npmDepsHash = "sha256-KZsxKDAQ7UTnEemr6S9rqKtqPeTvqrhfxURSGTKkMMM=";
 
   npmFlags = [ "--legacy-peer-deps" ];
   makeCacheWritable = true;
@@ -60,7 +60,7 @@ buildNpmPackage {
         inherit version;
 
         src = "${src}/release/app";
-        npmDepsHash = "sha256-KZ4TDf9Nz1/dPWAN/gI3tq0gvzI4BvSR3fawte2n9u0=";
+        npmDepsHash = "sha256-98P2dNmWcp8Hc8Xe43LM3dtxye7myhp1bHucKoKEcjI=";
 
         npmFlags = [ "--ignore-scripts" ];
         dontNpmBuild = true;

From e6bc540ce0714a02a5e7d1677622e3308b6252c5 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Tue, 28 Jan 2025 11:40:38 +0100
Subject: [PATCH 18/76] nixos/activation: pass the action as an argument to the
 pre-switch-checks

This allows for instance to reject switching into a configuration, while
still allowing to reboot into that same configuration.

This can be useful for instance to reject switching to a configuration
with a new systemd major version, but setting that same configuration as
the new boot default with `switch-to-configuration boot` is fine.
---
 nixos/modules/system/activation/switch-to-configuration.pl | 2 +-
 nixos/tests/switch-test.nix                                | 6 ++++--
 pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 3553c5fce4ce..672291541d03 100755
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -103,7 +103,7 @@ if (($ENV{"NIXOS_NO_CHECK"} // "") ne "1") {
     chomp(my $pre_switch_checks = <<'EOFCHECKS');
 @preSwitchCheck@
 EOFCHECKS
-    system("$pre_switch_checks $out") == 0 or exit 1;
+    system("$pre_switch_checks $out $action") == 0 or exit 1;
     if ($action eq "check") {
         exit 0;
     }
diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix
index 37a808c3c471..4ad08b726bf5 100644
--- a/nixos/tests/switch-test.nix
+++ b/nixos/tests/switch-test.nix
@@ -612,8 +612,10 @@ in {
       system.switch.enable = true;
       users.mutableUsers = true;
       system.preSwitchChecks.succeeds = ''
-        echo this will succeed
-        true
+        config="$1"
+        action="$2"
+        echo "this should succeed (config: $config, action: $action)"
+        [ "$action" == "check" ] || [ "$action" == "test" ]
       '';
       specialisation.failingCheck.configuration.system.preSwitchChecks.failEveryTime = ''
         echo this will fail
diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs
index 93da7aff7406..ecd6a6a71390 100644
--- a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs
+++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs
@@ -139,7 +139,7 @@ fn parse_os_release() -> Result<HashMap<String, String>> {
         }))
 }
 
-fn do_pre_switch_check(command: &str, toplevel: &Path) -> Result<()> {
+fn do_pre_switch_check(command: &str, toplevel: &Path, action: &Action) -> Result<()> {
     let mut cmd_split = command.split_whitespace();
     let Some(argv0) = cmd_split.next() else {
         bail!("missing first argument in install bootloader commands");
@@ -148,6 +148,7 @@ fn do_pre_switch_check(command: &str, toplevel: &Path) -> Result<()> {
     match std::process::Command::new(argv0)
         .args(cmd_split.collect::<Vec<&str>>())
         .arg(toplevel)
+        .arg::<&str>(action.into())
         .spawn()
         .map(|mut child| child.wait())
     {
@@ -1053,7 +1054,7 @@ fn do_system_switch(action: Action) -> anyhow::Result<()> {
         .unwrap_or_default()
         != "1"
     {
-        do_pre_switch_check(&pre_switch_check, &toplevel)?;
+        do_pre_switch_check(&pre_switch_check, &toplevel, action)?;
     }
 
     if *action == Action::Check {

From 6b62fda02923e0e1b0eb8160a6801ecc8362d025 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Tue, 28 Jan 2025 11:47:01 +0100
Subject: [PATCH 19/76] nixos/activation: format
 switch-to-configuration-ng/src/src/main.rs with rustfmt

---
 .../src/src/main.rs                           | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs
index ecd6a6a71390..a64d8566225b 100644
--- a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs
+++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs
@@ -887,10 +887,7 @@ impl std::fmt::Display for Job {
 
 fn new_dbus_proxies(
     conn: &LocalConnection,
-) -> (
-    Proxy<'_, &LocalConnection>,
-    Proxy<'_, &LocalConnection>,
-) {
+) -> (Proxy<'_, &LocalConnection>, Proxy<'_, &LocalConnection>) {
     (
         conn.with_proxy(
             "org.freedesktop.systemd1",
@@ -1221,16 +1218,16 @@ won't take effect until you reboot the system.
                     unit.as_str(),
                     "suspend.target" | "hibernate.target" | "hybrid-sleep.target"
                 ) || parse_systemd_bool(
-                        Some(&new_unit_info),
-                        "Unit",
-                        "RefuseManualStart",
-                        false,
-                    ) || parse_systemd_bool(
-                        Some(&new_unit_info),
-                        "Unit",
-                        "X-OnlyManualStart",
-                        false,
-                    )) {
+                    Some(&new_unit_info),
+                    "Unit",
+                    "RefuseManualStart",
+                    false,
+                ) || parse_systemd_bool(
+                    Some(&new_unit_info),
+                    "Unit",
+                    "X-OnlyManualStart",
+                    false,
+                )) {
                     units_to_start.insert(unit.to_string(), ());
                     record_unit(START_LIST_FILE, unit);
                     // Don't spam the user with target units that always get started.

From 713607abea89c61d29b2b621e14a1f08f2168df9 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Tue, 28 Jan 2025 12:00:10 +0100
Subject: [PATCH 20/76] nixos/activation: document the arguments that are
 passed to the pre-switch-check script

---
 nixos/modules/system/activation/pre-switch-check.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/system/activation/pre-switch-check.nix b/nixos/modules/system/activation/pre-switch-check.nix
index e8640a0db3f2..2b53e390b19d 100644
--- a/nixos/modules/system/activation/pre-switch-check.nix
+++ b/nixos/modules/system/activation/pre-switch-check.nix
@@ -44,6 +44,9 @@ in
       A set of shell script fragments that are executed before the switch to a
       new NixOS system configuration. A failure in any of these fragments will
       cause the switch to fail and exit early.
+      The scripts receive the new configuration path and the action verb passed
+      to switch-to-configuration, as the first and second positional arguments
+      (meaning that you can access them using `$1` and `$2`, respectively).
     '';
 
     type = lib.types.attrsOf lib.types.str;

From 30b1f5652a3b4a43988758b5f77ab7f2f564209c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 28 Jan 2025 09:11:31 +0100
Subject: [PATCH 21/76] ocamlPackages.gluon: fix build

---
 pkgs/development/ocaml-modules/gluon/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/ocaml-modules/gluon/default.nix b/pkgs/development/ocaml-modules/gluon/default.nix
index 38feb97ba896..9bc4408c28ab 100644
--- a/pkgs/development/ocaml-modules/gluon/default.nix
+++ b/pkgs/development/ocaml-modules/gluon/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildDunePackage,
   fetchurl,
+  fetchpatch,
   bytestring,
   config,
   libc,
@@ -20,6 +21,11 @@ buildDunePackage rec {
     hash = "sha256-YWJCPokY1A7TGqCGoxJl14oKDVeMNybEEB7KiK92WSo=";
   };
 
+  patches = fetchpatch {
+    url = "https://github.com/riot-ml/gluon/commit/b29c34d04ea05d7721a229c35132320e796ed4b2.patch";
+    hash = "sha256-XuzyoteQAgEs93WrgHTWT1I+hIJAiGiJ4XAiLtnEYtw=";
+  };
+
   buildInputs = [
     config
   ];

From 3d769188ec980c2ee78cb2cfa91c62e29a19e846 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 28 Jan 2025 09:11:42 +0100
Subject: [PATCH 22/76] ocamlPackages.core_unix: fix for OCaml 5.3

---
 pkgs/development/ocaml-modules/janestreet/0.17.nix | 8 ++++++++
 pkgs/top-level/ocaml-packages.nix                  | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix
index 404dfd614fbd..43d600469aeb 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.17.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix
@@ -1,6 +1,7 @@
 {
   self,
   bash,
+  fetchpatch,
   fzf,
   lib,
   openssl,
@@ -498,6 +499,13 @@ with self;
       patchShebangs unix_pseudo_terminal/src/discover.sh
     '';
     doCheck = false; # command_validate_parsing.exe is not specified in test build deps
+
+    # Compatibility with OCaml 5.3
+    patches = lib.optional (lib.versionAtLeast ocaml.version "5.3") (fetchpatch {
+      url = "https://github.com/janestreet/core_unix/commit/ebce389ac68e098f542e34400e114ac992f415af.patch";
+      includes = [ "bigstring_unix/src/bigstring_unix_stubs.c" ];
+      hash = "sha256-FGg2zlyp3aZFu1VeFdm7pgSPiW0HAkLYgMGTj+tqju8=";
+    });
   };
 
   csvfields = janePackage {
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index d8649636dbb2..9bcc8ab5b821 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -793,7 +793,7 @@ let
       then import ../development/ocaml-modules/janestreet/0.17.nix
          {
            inherit self;
-           inherit (pkgs) bash fzf lib openssl zstd;
+           inherit (pkgs) bash fetchpatch fzf lib openssl zstd;
          }
       else if lib.versionOlder "4.13.1" ocaml.version
       then import ../development/ocaml-modules/janestreet/0.16.nix {

From 866496759ff239ca55063fa6d76043c14f72d20f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 28 Jan 2025 09:11:38 +0100
Subject: [PATCH 23/76] ocamlPackages.async_ssl: fix for OCaml 5.3

---
 pkgs/development/ocaml-modules/janestreet/0.17.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix
index 43d600469aeb..a6bba01f125b 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.17.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix
@@ -212,6 +212,10 @@ with self;
       ctypes-foreign
       openssl
     ];
+    patches = fetchpatch {
+      url = "https://raw.githubusercontent.com/ocaml/opam-source-archives/main/patches/async_ssl/no-incompatible-pointer-types-017.patch";
+      hash = "sha256-bpfIi97/b1hIwsFzsmhFAZV1w8CdaMxXoi72ScSYMjY=";
+    };
   };
 
   async_unix = janePackage {

From 95dc3c9fadec65722715dbfcb0f16013c2f90ead Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 28 Jan 2025 09:11:45 +0100
Subject: [PATCH 24/76] =?UTF-8?q?ocamlPackages.secp256k1:=20fix=20for=20OC?=
 =?UTF-8?q?aml=20=E2=89=A5=205.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/secp256k1/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/ocaml-modules/secp256k1/default.nix b/pkgs/development/ocaml-modules/secp256k1/default.nix
index 5a97578db5dd..d27d260a3723 100644
--- a/pkgs/development/ocaml-modules/secp256k1/default.nix
+++ b/pkgs/development/ocaml-modules/secp256k1/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitHub,
+  fetchpatch,
   buildDunePackage,
   base,
   stdio,
@@ -21,6 +22,11 @@ buildDunePackage rec {
     hash = "sha256-22+dZb3MC1W5Qvsz3+IHV1/XiGCRmJHTH+6IW2QX2hU=";
   };
 
+  patches = fetchpatch {
+    url = "https://github.com/dakk/secp256k1-ml/commit/9bde90a401746dcecdab68a2fdb95659d16a3022.patch";
+    hash = "sha256-QndtZJtPKPjuv84jDmXc9Q/xGLb/mNUGL4AvRecSFlQ=";
+  };
+
   buildInputs = [
     base
     stdio

From 366f4c3db10a4194c053eadf2ea99ef8f71f6154 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 28 Jan 2025 09:11:49 +0100
Subject: [PATCH 25/76] =?UTF-8?q?ocamlPackages.ppxlib=5Fjane:=200.17.1=20?=
 =?UTF-8?q?=E2=86=92=200.17.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/janestreet/0.17.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix
index a6bba01f125b..8e43fde337bf 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.17.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix
@@ -1557,8 +1557,8 @@ with self;
     // (
       if lib.versionAtLeast ocaml.version "5.3" then
         {
-          version = "0.17.1";
-          hash = "sha256-kcGXqO1kFYds8KwLvpIQ7OKhqnp6JZs8WYYLi7o/nBw=";
+          version = "0.17.2";
+          hash = "sha256-AQJSdKtF6p/aG5Lx8VHVEOsisH8ep+iiml6DtW+Hdik=";
         }
       else
         {

From a8bd62adaf5f0172cfd2bf804b0134e9a494c8e7 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 28 Jan 2025 09:11:52 +0100
Subject: [PATCH 26/76] ocamlPackages.labltk: add version 8.06.15 for OCaml 5.3

---
 pkgs/development/ocaml-modules/labltk/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix
index b7e00aec4908..2ec6bc0e9d5c 100644
--- a/pkgs/development/ocaml-modules/labltk/default.nix
+++ b/pkgs/development/ocaml-modules/labltk/default.nix
@@ -78,6 +78,10 @@ let
         version = "8.06.14";
         sha256 = "sha256-eVSQetk+i3KObjHfsvnD615cIsq3aZ7IxycX42cuPIU=";
       };
+      "5.3" = mkNewParam {
+        version = "8.06.15";
+        sha256 = "sha256-I/y5qr5sasCtlrwxL/Lex79rg0o4tzDMBmQY7MdpU2w=";
+      };
     };
   param =
     params.${lib.versions.majorMinor ocaml.version}

From 2c22ac2fb68a155c8ce03b0143dad77b98acf09a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 28 Jan 2025 09:11:56 +0100
Subject: [PATCH 27/76] ocamlPackages.lsp: add version 1.22.0 for OCaml 5.3

---
 pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix | 9 ++++++++-
 pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix     | 4 +++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
index aa90b9ac91f3..451b9e7f0d88 100644
--- a/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
+++ b/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
@@ -9,7 +9,9 @@
   lib,
   ocaml,
   version ?
-    if lib.versionAtLeast ocaml.version "5.2" then
+    if lib.versionAtLeast ocaml.version "5.3" then
+      "1.22.0"
+    else if lib.versionAtLeast ocaml.version "5.2" then
       "1.21.0"
     else if lib.versionAtLeast ocaml.version "4.14" then
       "1.18.0"
@@ -24,6 +26,11 @@
 let
   params =
     {
+      "1.22.0" = {
+        name = "lsp";
+        minimalOCamlVersion = "5.2";
+        sha256 = "sha256-UZ3DV30V3CIQ3vpYBIGnQ1eRGNUGk7aRuxDLyCA/tYE=";
+      };
       "1.21.0" = {
         name = "lsp";
         minimalOCamlVersion = "5.2";
diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
index e05c0494515f..d9c5df1c63f5 100644
--- a/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
+++ b/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix
@@ -23,7 +23,9 @@
   ocamlformat-rpc-lib,
   ocaml,
   version ?
-    if lib.versionAtLeast ocaml.version "5.2" then
+    if lib.versionAtLeast ocaml.version "5.3" then
+      "1.22.0"
+    else if lib.versionAtLeast ocaml.version "5.2" then
       "1.21.0"
     else if lib.versionAtLeast ocaml.version "4.14" then
       "1.18.0"

From c8e664839b00a31708f2a579685eea9b76c2fa8f Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Tue, 28 Jan 2025 11:11:29 -0800
Subject: [PATCH 28/76] nixos/rtl-sdr: modernize

---
 nixos/modules/hardware/rtl-sdr.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/hardware/rtl-sdr.nix b/nixos/modules/hardware/rtl-sdr.nix
index 05a3b5412412..28b4c89963ca 100644
--- a/nixos/modules/hardware/rtl-sdr.nix
+++ b/nixos/modules/hardware/rtl-sdr.nix
@@ -19,6 +19,7 @@ in
         This is a prerequisite to using devices supported by rtl-sdr without being root, since rtl-sdr USB descriptors will be owned by plugdev through udev.
       '';
     };
+    package = lib.mkPackageOption pkgs "rtl-sdr" { };
   };
 
   config = lib.mkIf cfg.enable {
@@ -27,7 +28,8 @@ in
       "e4000"
       "rtl2832"
     ];
-    services.udev.packages = [ pkgs.rtl-sdr ];
+    services.udev.packages = [ cfg.package ];
+    environment.systemPackages = [ cfg.package ];
     users.groups.plugdev = { };
   };
 }

From 572d780fbe2d4c3a4214969209445ce113a7c249 Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Tue, 28 Jan 2025 11:12:22 -0800
Subject: [PATCH 29/76] nixos/rtl-sdr: adopt

---
 nixos/modules/hardware/rtl-sdr.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/hardware/rtl-sdr.nix b/nixos/modules/hardware/rtl-sdr.nix
index 28b4c89963ca..7124d7e4280a 100644
--- a/nixos/modules/hardware/rtl-sdr.nix
+++ b/nixos/modules/hardware/rtl-sdr.nix
@@ -32,4 +32,6 @@ in
     environment.systemPackages = [ cfg.package ];
     users.groups.plugdev = { };
   };
+
+  meta.maintainers = with lib.maintainers; [ pandapip1 ];
 }

From 2fa6cc22cea4bc4aaa33eb2220209b88e8c13a6f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Jan 2025 07:18:09 +0000
Subject: [PATCH 30/76] silx: 2.1.2 -> 2.2.0

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

diff --git a/pkgs/by-name/si/silx/package.nix b/pkgs/by-name/si/silx/package.nix
index 6b80d173da79..24ea2f0cd497 100644
--- a/pkgs/by-name/si/silx/package.nix
+++ b/pkgs/by-name/si/silx/package.nix
@@ -6,13 +6,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "silx";
-  version = "2.1.2";
+  version = "2.2.0";
 
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Uep/BkH3ngGDbPMVptab64SKBbOGqa0qazUoT47idqU=";
+    hash = "sha256-ff2YUp0GjOKAm2k+eBF+WlYlo8Z7gmUjFgTFTvOxRzI=";
   };
 
   build-system = with python3Packages; [

From f3b1b59022479393373145f625b8dae33ce252bc Mon Sep 17 00:00:00 2001
From: Artyom Pertsovsky <artyom@pertsovsky.com>
Date: Wed, 8 Jan 2025 00:19:23 +0200
Subject: [PATCH 31/76] keylight-cli: init at 1.0.0

---
 maintainers/maintainer-list.nix          |  6 ++++
 pkgs/by-name/ke/keylight-cli/package.nix | 38 ++++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/by-name/ke/keylight-cli/package.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 078d0560ac24..695eb669eec0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -23915,6 +23915,12 @@
     githubId = 245573;
     name = "Dmitry Kalinkin";
   };
+  versality = {
+    email = "artyom@pertsovsky.com";
+    github = "versality";
+    githubId = 1486626;
+    name = "Artyom Pertsovsky";
+  };
   vglfr = {
     email = "vf.velt@gmail.com";
     github = "vglfr";
diff --git a/pkgs/by-name/ke/keylight-cli/package.nix b/pkgs/by-name/ke/keylight-cli/package.nix
new file mode 100644
index 000000000000..8814788e73df
--- /dev/null
+++ b/pkgs/by-name/ke/keylight-cli/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  babashka,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "keylight-cli";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "versality";
+    repo = "keylight-cli";
+    tag = "v${version}";
+    sha256 = "sha256-gzTvMBa7JVckxLnltlR5XOj6BBbfPXZei7Wj3f1n4Kw=";
+  };
+
+  buildInputs = [ babashka ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    install -Dm755 keylight.bb $out/bin/keylight
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "CLI tool to control Elgato Key Light devices";
+    homepage = "https://github.com/versality/keylight-cli";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ versality ];
+    mainProgram = "keylight";
+    platforms = platforms.all;
+  };
+}

From 96ed2deb2edabd3fd87b4583cebe50ccac2fdfda Mon Sep 17 00:00:00 2001
From: Esteban Macanek <75503218+EstebanMacanek@users.noreply.github.com>
Date: Fri, 24 Jan 2025 22:01:43 -0300
Subject: [PATCH 32/76] xephem: init at 4.2.0

---
 .../add-cross-compilation-support.patch       | 153 ++++++++++++++++++
 pkgs/by-name/xe/xephem/package.nix            | 112 +++++++++++++
 2 files changed, 265 insertions(+)
 create mode 100644 pkgs/by-name/xe/xephem/add-cross-compilation-support.patch
 create mode 100644 pkgs/by-name/xe/xephem/package.nix

diff --git a/pkgs/by-name/xe/xephem/add-cross-compilation-support.patch b/pkgs/by-name/xe/xephem/add-cross-compilation-support.patch
new file mode 100644
index 000000000000..bfa05a4661ce
--- /dev/null
+++ b/pkgs/by-name/xe/xephem/add-cross-compilation-support.patch
@@ -0,0 +1,153 @@
+diff --git a/libastro/Makefile b/libastro/Makefile
+index 0a8ecb6..b24e827 100644
+--- a/libastro/Makefile
++++ b/libastro/Makefile
+@@ -3,6 +3,9 @@
+ 
+ # compiler and flags
+ 
++AR = ar
++RANLIB = ranlib
++
+ # gcc
+ CC = gcc
+ CFLAGS= -O2 -Wall
+@@ -83,8 +86,8 @@ OBJS =			\
+ 	vsop87_data.o
+ 
+ libastro.a: $(HS) $(OBJS)
+-	ar rv $@ $(OBJS)
+-	ranlib $@
++	$(AR) rv $@ $(OBJS)
++	$(RANLIB) $@
+ 
+ libastro.so: $(HS) $(OBJS)
+ 	$(CC) -shared -o $@ $(OBJS)
+diff --git a/libip/Makefile b/libip/Makefile
+index 5c36ac8..e223dca 100644
+--- a/libip/Makefile
++++ b/libip/Makefile
+@@ -1,6 +1,9 @@
+ # Makefile for image processing routines, libip.
+ # (C) 2001 Elwood Charles Downey
+ 
++AR = ar
++RANLIB = ranlib
++
+ # gcc
+ CC = gcc
+ CFLAGS= -I../libastro -O2 -Wall
+@@ -36,11 +39,11 @@ OBJS =	\
+ HS = ip.h fsmatch.h
+ 
+ libip.a: $(HS)	$(OBJS)
+-	ar rv $@ $(OBJS)
+-	ranlib $@
++	$(AR) rv $@ $(OBJS)
++	$(RANLIB) $@
+ 
+ libip.so:    $(OBJS)
+-	gcc -shared -o $@ $(OBJS)
++	$(CC) -shared -o $@ $(OBJS)
+ 
+ clobber:
+ 	rm -f *.o libip.a
+diff --git a/libjpegd/Makefile b/libjpegd/Makefile
+index 46ea040..7562fc5 100644
+--- a/libjpegd/Makefile
++++ b/libjpegd/Makefile
+@@ -2,6 +2,9 @@
+ 
+ # compiler and flags
+ 
++AR = ar
++RANLIB = ranlib
++
+ # gcc
+ CC = gcc
+ CFLAGS= -O2 -Wall
+@@ -62,8 +65,8 @@ OBJS = \
+ 	jutils.o
+ 
+ libjpegd.a: $(HS) $(OBJS)
+-	ar r $@ $(OBJS)
+-	ranlib $@
++	$(AR) r $@ $(OBJS)
++	$(RANLIB) $@
+ 
+ clobber:
+ 	touch x.o x.a
+diff --git a/liblilxml/Makefile b/liblilxml/Makefile
+index 2e73761..7f3f2c3 100644
+--- a/liblilxml/Makefile
++++ b/liblilxml/Makefile
+@@ -3,6 +3,9 @@
+ 
+ # compiler and flags
+ 
++AR = ar
++RANLIB = ranlib
++
+ # gcc
+ CC = gcc
+ CFLAGS= -O2 -Wall
+@@ -27,8 +30,8 @@ HS = lilxml.h
+ OBJS = lilxml.o base64.o
+ 
+ liblilxml.a: $(HS) $(OBJS)
+-	ar r $@ $(OBJS)
+-	ranlib $@
++	$(AR) r $@ $(OBJS)
++	$(RANLIB) $@
+ 
+ liltest: liltest.o liblilxml.a
+ 	$(CC) $(LDFLAGS) -o liltest liltest.o liblilxml.a
+diff --git a/libpng/Makefile b/libpng/Makefile
+index 5f332cc..6217f2f 100644
+--- a/libpng/Makefile
++++ b/libpng/Makefile
+@@ -10,7 +10,7 @@ ZLIBLIB = ../libz
+ # Compiler, linker, lib and other tools
+ CC = gcc
+ LD = $(CC)
+-AR = ar rcs
++AR = ar
+ RANLIB = ranlib
+ RM = rm -f
+ 
+@@ -38,7 +38,7 @@ OBJS = png$(O) pngerror$(O) pngget$(O) pngmem$(O) pngpread$(O) \
+ all: libpng$(A)
+ 
+ libpng$(A): $(OBJS)
+-	$(AR) $@ $(OBJS)
++	$(AR) rcs $@ $(OBJS)
+ 	$(RANLIB) $@
+ 
+ clean:
+diff --git a/libz/Makefile b/libz/Makefile
+index 773f3ed..0fc73c0 100644
+--- a/libz/Makefile
++++ b/libz/Makefile
+@@ -1,3 +1,7 @@
++AR = ar
++RANLIB = ranlib
++
++CC = cc
+ CLDFLAGS =
+ CFLAGS = $(CLDFLAGS) -Wall -O2
+ LDFLAGS =
+@@ -17,11 +21,11 @@ OBJS =	adler32.o	\
+ 	inffast.o
+ 
+ libz.a: $(OBJS)
+-	ar rc libz.a $(OBJS)
+-	-ranlib libz.a
++	$(AR) rc libz.a $(OBJS)
++	$(RANLIB) libz.a
+ 
+ testzlib: testzlib.o libz.a
+-	cc $(LDFLAGS) -o testzlib testzlib.o libz.a
++	$(CC) $(LDFLAGS) -o testzlib testzlib.o libz.a
+ 
+ clean:
+ 	rm -f *.o *.a testzlib
diff --git a/pkgs/by-name/xe/xephem/package.nix b/pkgs/by-name/xe/xephem/package.nix
new file mode 100644
index 000000000000..edaec00e8670
--- /dev/null
+++ b/pkgs/by-name/xe/xephem/package.nix
@@ -0,0 +1,112 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  makeDesktopItem,
+  copyDesktopItems,
+  installShellFiles,
+  motif,
+  openssl,
+  groff,
+  xorg,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "xephem";
+  version = "4.2.0";
+
+  src = fetchFromGitHub {
+    owner = "XEphem";
+    repo = "XEphem";
+    rev = version;
+    hash = "sha256-TuzXrWoJOAHg31DrJObPcHBXgtqR/KWKFRsqddPzL4c=";
+  };
+
+  nativeBuildInputs = [
+    copyDesktopItems
+    installShellFiles
+    groff # nroff
+  ];
+
+  buildInputs = [
+    motif
+    openssl
+    xorg.libXmu
+    xorg.libXext
+    xorg.libXt
+  ];
+
+  patches = [
+    # fix compile error with GCC 14
+    (fetchpatch {
+      url = "https://github.com/XEphem/XEphem/commit/30e14f685ede015fcd8985cd83ee6510f93f0073.patch";
+      hash = "sha256-wNoLjR6xEl56ZA6FLBS2xtySeDEYXTCA8j4Z5JIrF6k=";
+    })
+    ./add-cross-compilation-support.patch
+  ];
+
+  postPatch = ''
+    cd GUI/xephem
+    substituteInPlace xephem.c splash.c --replace-fail '/etc/XEphem' '${placeholder "out"}/etc/XEphem'
+  '';
+
+  doCheck = true;
+
+  checkFlags = "-C ../../tests";
+
+  checkTarget = "run-test";
+
+  makeFlags = [
+    "CC=${stdenv.cc.targetPrefix}cc"
+    "AR=${stdenv.cc.targetPrefix}ar"
+    "RANLIB=${stdenv.cc.targetPrefix}ranlib"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    installBin xephem
+    mkdir -p $out/share/xephem
+    cp -R auxil $out/share/xephem/
+    cp -R catalogs $out/share/xephem/
+    cp -R fifos $out/share/xephem/
+    cp -R fits $out/share/xephem/
+    cp -R gallery $out/share/xephem/
+    cp -R help $out/share/xephem/
+    cp -R lo $out/share/xephem/
+    mkdir $out/etc
+    echo "XEphem.ShareDir: $out/share/xephem" > $out/etc/XEphem
+    installManPage xephem.1
+    install -Dm644 XEphem.png -t $out/share/pixmaps
+    runHook postInstall
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "xephem";
+      exec = "xephem";
+      icon = "XEphem";
+      desktopName = "XEphem";
+      categories = [
+        "Science"
+        "Astronomy"
+      ];
+    })
+  ];
+
+  meta = {
+    description = "Interactive astronomy program for all UNIX platforms";
+    longDescription = ''
+      Xephem is an interactive astronomical ephemeris program for X Windows systems. It computes
+      heliocentric, geocentric and topocentric information for fixed celestial objects and objects
+      in heliocentric and geocentric orbits; has built-in support for all planet positions; the
+      moons of Jupiter, Saturn and Earth; Mars' and Jupiter's central meridian longitude; Saturn's
+      rings; and Jupiter's Great Red Spot.
+    '';
+    mainProgram = "xephem";
+    homepage = "https://xephem.github.io/XEphem/Site/xephem.html";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ EstebanMacanek ];
+    platforms = lib.platforms.unix;
+  };
+}

From 37d4584a54348a40be574048f38cd35a8c895cc2 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Wed, 29 Jan 2025 12:52:35 +0100
Subject: [PATCH 33/76] brlaser: Formatting improvements

---
 pkgs/by-name/br/brlaser/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/br/brlaser/package.nix b/pkgs/by-name/br/brlaser/package.nix
index fff6673a9cf8..52fa1d766db4 100644
--- a/pkgs/by-name/br/brlaser/package.nix
+++ b/pkgs/by-name/br/brlaser/package.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
+
   buildInputs = [
     zlib
     cups
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
     "-DCUPS_DATA_DIR=share/cups"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "CUPS driver for Brother laser printers";
     longDescription = ''
       Although most Brother printers support a standard printer language such as PCL or PostScript, not all do. If you have a monochrome Brother laser printer (or multi-function device) and the other open source drivers don't work, this one might help.
@@ -68,8 +69,8 @@ stdenv.mkDerivation rec {
           Lenovo M7605D
     '';
     homepage = "https://github.com/pdewacht/brlaser";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ StijnDW ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ StijnDW ];
   };
 }

From ad669d4f33bd3720dad3183674a63d265644ea2a Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Wed, 29 Jan 2025 13:06:57 +0100
Subject: [PATCH 34/76] brlaser: Fix cross compilation

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

diff --git a/pkgs/by-name/br/brlaser/package.nix b/pkgs/by-name/br/brlaser/package.nix
index 52fa1d766db4..deeda18924ec 100644
--- a/pkgs/by-name/br/brlaser/package.nix
+++ b/pkgs/by-name/br/brlaser/package.nix
@@ -18,7 +18,10 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-1fvO9F7ifbYQHAy54mOx052XutfKXSK6iT/zj4Mhbww=";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    cups
+  ];
 
   buildInputs = [
     zlib

From 0cf0f7ca9fa726a4fef2a39c18951af8d6edd433 Mon Sep 17 00:00:00 2001
From: Viktor Illmer <1476338+v-ji@users.noreply.github.com>
Date: Tue, 7 Jan 2025 17:05:18 +0100
Subject: [PATCH 35/76] dinish: init at 4.005

---
 pkgs/by-name/di/dinish/package.nix | 37 ++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pkgs/by-name/di/dinish/package.nix

diff --git a/pkgs/by-name/di/dinish/package.nix b/pkgs/by-name/di/dinish/package.nix
new file mode 100644
index 000000000000..7e316fc56e1a
--- /dev/null
+++ b/pkgs/by-name/di/dinish/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchzip,
+  nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "dinish";
+  version = "4.005";
+
+  src = fetchzip {
+    url = "https://github.com/playbeing/dinish/releases/download/v${version}/dinish-ttf.zip";
+    stripRoot = false;
+    hash = "sha256-K4JzqzlxOpy4rIF9kdrQlCIyrykDhnF1p1Q8CDMWBqg=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 *.ttf -t $out/share/fonts/truetype
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    homepage = "https://github.com/playbeing/dinish";
+    changelog = "https://github.com/playbeing/dinish/blob/v${version}/FONTLOG.txt";
+    description = "Modern computer font inspired by DIN 1451";
+    longDescription = "DINish is one of many modern computer fonts that were inspired by the lettering of the German Autobahn road signs. It is professionally designed, and usable for body text and captions, even spreadsheets. Its unadorned style is easy to read, and although it is close to a century old maintains a fresh look.";
+    license = licenses.ofl;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ vji ];
+  };
+}

From e79b6c06f2177335ad0b671e36327c33c8fb36d8 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Thu, 30 Jan 2025 03:54:38 +0900
Subject: [PATCH 36/76] uv: 0.5.24 -> 0.5.25

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 5d44a274a3d5..cceff8bbb193 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.24";
+  version = "0.5.25";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = version;
-    hash = "sha256-a4SemtzExhQing7CKjNvakoZSkI7wX01JPz4xWwEraQ=";
+    hash = "sha256-nDZaS3Yc7Z8gKyl2+HTpwoTTJKJDZCTQIiZazICvlvQ=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-UdS3SiviF3j3XUd1hUD9eIurKaC9ZX7DrvvE158zS5w=";
+  cargoHash = "sha256-GWlL5NZwHfkOfl16Eh38xo4OETmy/HFFeOZCGDruluI=";
 
   nativeBuildInputs = [
     cmake

From 5de78a68348c47283c041deadec49b91d2c0a424 Mon Sep 17 00:00:00 2001
From: James Ward <james@jamesward.com>
Date: Wed, 29 Jan 2025 12:47:56 -0700
Subject: [PATCH 37/76] jetbrains: 2024.1.1 -> 2024.3.4

jetbrains.aqua: 2024.3.1 -> 2024.3.2
jetbrains.gateway: 2024.3.1.1 -> 2024.3.2
jetbrains.goland: 2024.3.2 -> 2024.3.2.1
jetbrains.idea-community: 2024.3.2 -> 2024.3.2.2
jetbrains.idea-ultimate: 2024.3.2 -> 2024.3.2.2
jetbrains.mps: 2024.1.1 -> 2024.3
jetbrains.phpstorm: 2024.3.2 -> 2024.3.2.1
jetbrains.pycharm-community: 2024.3.1.1 -> 2024.3.2
jetbrains.pycharm-professional: 2024.3.1.1 -> 2024.3.2
jetbrains.rider: 2024.3.3 -> 2024.3.4
jetbrains.ruby-mine: 2024.3.2 -> 2024.3.2.1
jetbrains.rust-rover: 2024.3.3 -> 2024.3.4
jetbrains.webstorm: 2024.3.2 -> 2024.3.2.1
---
 .../editors/jetbrains/bin/versions.json       | 416 +++++++++---------
 1 file changed, 208 insertions(+), 208 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json
index 6ac306823db8..5cf8080d0466 100644
--- a/pkgs/applications/editors/jetbrains/bin/versions.json
+++ b/pkgs/applications/editors/jetbrains/bin/versions.json
@@ -3,10 +3,10 @@
     "aqua": {
       "update-channel": "Aqua RELEASE",
       "url-template": "https://download.jetbrains.com/aqua/aqua-{version}.tar.gz",
-      "version": "2024.3.1",
-      "sha256": "e304d8f900881d18865010819dc035d59be00b1364baa2b98ef47d923907ce57",
-      "url": "https://download.jetbrains.com/aqua/aqua-2024.3.1.tar.gz",
-      "build_number": "243.22562.238"
+      "version": "2024.3.2",
+      "sha256": "de073e8a3734a2c4ef984b3e1bd68f5de72a6180e73400889510439ac3f419aa",
+      "url": "https://download.jetbrains.com/aqua/aqua-2024.3.2.tar.gz",
+      "build_number": "243.23654.154"
     },
     "clion": {
       "update-channel": "CLion RELEASE",
@@ -35,99 +35,99 @@
     "gateway": {
       "update-channel": "Gateway RELEASE",
       "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
-      "version": "2024.3.1.1",
-      "sha256": "625bd0794b535b40926f3fed15b50e1df8ee181acd5a1a8fb174f19cd450cef0",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.1.1.tar.gz",
-      "build_number": "243.22562.252"
+      "version": "2024.3.2",
+      "sha256": "39c8f8414cfeaacbbb011c33c539d7ca4007d7f867421438292572dc51398664",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.2.tar.gz",
+      "build_number": "243.23654.132"
     },
     "goland": {
       "update-channel": "GoLand RELEASE",
       "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
-      "version": "2024.3.2",
-      "sha256": "6700ec71240cbde6002e9b28680b02f3a4b9ee0a7bd7a4d3bf5a13f67b8d53af",
-      "url": "https://download.jetbrains.com/go/goland-2024.3.2.tar.gz",
-      "build_number": "243.23654.119"
+      "version": "2024.3.2.1",
+      "sha256": "8bd2420312acd4936ca3d2a4f9ceb0f0fcf96da538f6042d219c6839d25c6a6a",
+      "url": "https://download.jetbrains.com/go/goland-2024.3.2.1.tar.gz",
+      "build_number": "243.23654.166"
     },
     "idea-community": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
-      "version": "2024.3.2",
-      "sha256": "ad9d587b704806d9a21dfebe5c51415df94699bba958d7133763cfd56934ced8",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.2.tar.gz",
-      "build_number": "243.23654.117"
+      "version": "2024.3.2.2",
+      "sha256": "d73fd631943c300d55729bd33e06e193751478a83477153807cfa941e4bf12e5",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.2.2.tar.gz",
+      "build_number": "243.23654.189"
     },
     "idea-ultimate": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
-      "version": "2024.3.2",
-      "sha256": "05f30fff53c1b73f9c261e812c236134e203bf7d847424a27d9409fd6b0b6fcb",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.2.tar.gz",
-      "build_number": "243.23654.117"
+      "version": "2024.3.2.2",
+      "sha256": "7094daa174aa74c163ecbc3958405c99b209333ca23e5accd02ed8100c015e38",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.2.2.tar.gz",
+      "build_number": "243.23654.189"
     },
     "mps": {
       "update-channel": "MPS RELEASE",
       "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
-      "version": "2024.1.1",
-      "sha256": "008fc1c27002d7cd247f72cf5045b46cad35a0117e120565f4cce2311509be22",
-      "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1.1.tar.gz",
-      "build_number": "241.19072.1155"
+      "version": "2024.3",
+      "sha256": "449048a9cdb944d4c3addf8156545c363be237ceb2b6f8516d72cb53eb00a37c",
+      "url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3.tar.gz",
+      "build_number": "243.21565.447"
     },
     "phpstorm": {
       "update-channel": "PhpStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
-      "version": "2024.3.2",
-      "sha256": "922f11f877b66d1815d5440b4891421269d2d235112e2fa6270b61096db36c2f",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.2.tar.gz",
-      "build_number": "243.23654.115",
+      "version": "2024.3.2.1",
+      "sha256": "d6f7e7c60659fb4215da32ac7daeae5202a86bbb2e971963081ee4a56e579685",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.2.1.tar.gz",
+      "build_number": "243.23654.168",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
-      "version": "2024.3.1.1",
-      "sha256": "36b9332262815099d0b86d2689fcf91b379730cb838623d82c0845969bb6470f",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.1.1.tar.gz",
-      "build_number": "243.22562.220"
+      "version": "2024.3.2",
+      "sha256": "1674426c19a62f1046500b2bb170c849ddd259b2c4a4394bb2c90106aa316c4b",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.2.tar.gz",
+      "build_number": "243.23654.177"
     },
     "pycharm-professional": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
-      "version": "2024.3.1.1",
-      "sha256": "5698131d93d00a261c720a31ec54ef1c850581c274be6938dd923e8c0383da25",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.1.1.tar.gz",
-      "build_number": "243.22562.220"
+      "version": "2024.3.2",
+      "sha256": "520ffc8c2d4ebd2d75663c74567882af28c3a5d595d165a494394842330b2b5a",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.2.tar.gz",
+      "build_number": "243.23654.177"
     },
     "rider": {
       "update-channel": "Rider RELEASE",
       "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
-      "version": "2024.3.3",
-      "sha256": "3185826c0d85c06bf18c5ece3f5f9698acef006932b7a92b6cb190fd4d8e2807",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.3.tar.gz",
-      "build_number": "243.22562.250"
+      "version": "2024.3.4",
+      "sha256": "8f63b8ae5be2834212b629a0d3f7d8a17c03154f069920dab8e24f61dbe5a4a5",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.4.tar.gz",
+      "build_number": "243.23654.126"
     },
     "ruby-mine": {
       "update-channel": "RubyMine RELEASE",
       "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
-      "version": "2024.3.2",
-      "sha256": "8c064b6119062ae568df795c45054cbdf608951e9c59957d95879fed7c30714e",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.2.tar.gz",
-      "build_number": "243.23654.112"
+      "version": "2024.3.2.1",
+      "sha256": "94c68e534f420648316867470271d9a3111f3c2afa7fcde6a4e3986058b2cdd2",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.2.1.tar.gz",
+      "build_number": "243.23654.167"
     },
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz",
-      "version": "2024.3.3",
-      "sha256": "abb5738327c0530c05be26b65abaead342e6aedb409b481dd537274d3dfd33f0",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.3.tar.gz",
-      "build_number": "243.23654.116"
+      "version": "2024.3.4",
+      "sha256": "1e7347b37a26715f5afdf101208342e6088d0d8421c9ee1661f48efb38cac8b4",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.4.tar.gz",
+      "build_number": "243.23654.180"
     },
     "webstorm": {
       "update-channel": "WebStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
-      "version": "2024.3.2",
-      "sha256": "2e9054ae506e578cf89e4cea017d953c416281470a4a5728b157e43ac4888d4e",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.2.tar.gz",
-      "build_number": "243.23654.120"
+      "version": "2024.3.2.1",
+      "sha256": "9857bdcd2c05eb215e3974b4df2a5a9b0fc8c1df929d31c9c9dae4c87496de60",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.2.1.tar.gz",
+      "build_number": "243.23654.157"
     },
     "writerside": {
       "update-channel": "Writerside EAP",
@@ -142,10 +142,10 @@
     "aqua": {
       "update-channel": "Aqua RELEASE",
       "url-template": "https://download.jetbrains.com/aqua/aqua-{version}-aarch64.tar.gz",
-      "version": "2024.3.1",
-      "sha256": "4895ad44a456f56121cc4e78be45b6a4ccae8080ab7251cd434304465d01f7c4",
-      "url": "https://download.jetbrains.com/aqua/aqua-2024.3.1-aarch64.tar.gz",
-      "build_number": "243.22562.238"
+      "version": "2024.3.2",
+      "sha256": "d2a3c781756a83ccea63dc6d9aebf85f819de1edb5bcd4e5a1a161eaa0779c84",
+      "url": "https://download.jetbrains.com/aqua/aqua-2024.3.2-aarch64.tar.gz",
+      "build_number": "243.23654.154"
     },
     "clion": {
       "update-channel": "CLion RELEASE",
@@ -174,99 +174,99 @@
     "gateway": {
       "update-channel": "Gateway RELEASE",
       "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz",
-      "version": "2024.3.1.1",
-      "sha256": "d5481582f8448659a293bc101b9ce2355368c60ab5a18370d4ba09a2eeebf458",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.1.1-aarch64.tar.gz",
-      "build_number": "243.22562.252"
+      "version": "2024.3.2",
+      "sha256": "8f8dafbd75fe134235053d58b495dc017e8c9399976613b08b4c724579847f71",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.2-aarch64.tar.gz",
+      "build_number": "243.23654.132"
     },
     "goland": {
       "update-channel": "GoLand RELEASE",
       "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz",
-      "version": "2024.3.2",
-      "sha256": "46a83f45cbc7193483d19cacd79ab310adb7b88af859903c2dc7713835d53f6c",
-      "url": "https://download.jetbrains.com/go/goland-2024.3.2-aarch64.tar.gz",
-      "build_number": "243.23654.119"
+      "version": "2024.3.2.1",
+      "sha256": "4738ad9275c9a08c4a1e5bec7432a5338eeb4c02662179d1c6e9efa9226277a1",
+      "url": "https://download.jetbrains.com/go/goland-2024.3.2.1-aarch64.tar.gz",
+      "build_number": "243.23654.166"
     },
     "idea-community": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz",
-      "version": "2024.3.2",
-      "sha256": "0135027b97fcabd8f9e31d34cd2444323c63c894ef3f8c6eaf734fbecb8694ef",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.2-aarch64.tar.gz",
-      "build_number": "243.23654.117"
+      "version": "2024.3.2.2",
+      "sha256": "ffdf4a5bdf8ba88c7afdbcd777aee7ce4113af016f0a671fa8a7fe6703734c7f",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.2.2-aarch64.tar.gz",
+      "build_number": "243.23654.189"
     },
     "idea-ultimate": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz",
-      "version": "2024.3.2",
-      "sha256": "d41082d25ec1639d399a5cbbabf29afa8082d6eddff8b24e56107f159dbe85b4",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.2-aarch64.tar.gz",
-      "build_number": "243.23654.117"
+      "version": "2024.3.2.2",
+      "sha256": "1e279d974b0134bdfc2cfb2ab8f46576c3372e5fa868e5c6a6e40916b9144f6c",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.2.2-aarch64.tar.gz",
+      "build_number": "243.23654.189"
     },
     "mps": {
       "update-channel": "MPS RELEASE",
       "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
-      "version": "2024.1.1",
-      "sha256": "008fc1c27002d7cd247f72cf5045b46cad35a0117e120565f4cce2311509be22",
-      "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1.1.tar.gz",
-      "build_number": "241.19072.1155"
+      "version": "2024.3",
+      "sha256": "449048a9cdb944d4c3addf8156545c363be237ceb2b6f8516d72cb53eb00a37c",
+      "url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3.tar.gz",
+      "build_number": "243.21565.447"
     },
     "phpstorm": {
       "update-channel": "PhpStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz",
-      "version": "2024.3.2",
-      "sha256": "b01643f20e9db333baa5204f8e0cf7da2eb952ca9e5a526290daf8cb4b14b74f",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.2-aarch64.tar.gz",
-      "build_number": "243.23654.115",
+      "version": "2024.3.2.1",
+      "sha256": "637edd1410045c6c42d54909c4548dbd82fc02d809401d817606efc7e1afe4bd",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.2.1-aarch64.tar.gz",
+      "build_number": "243.23654.168",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz",
-      "version": "2024.3.1.1",
-      "sha256": "cbc36953b6943e70468e1908bef9adddc2a9597124e5d794f294095888b0914c",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.1.1-aarch64.tar.gz",
-      "build_number": "243.22562.220"
+      "version": "2024.3.2",
+      "sha256": "9fff53f58d2ba25b076725e9087ee4c2e0d550b5358137e435d9224f7b5dda45",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.2-aarch64.tar.gz",
+      "build_number": "243.23654.177"
     },
     "pycharm-professional": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz",
-      "version": "2024.3.1.1",
-      "sha256": "a301f7316b17ace60c9e765f50ae0987262e99da3feb222c9abf761fda10cff3",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.1.1-aarch64.tar.gz",
-      "build_number": "243.22562.220"
+      "version": "2024.3.2",
+      "sha256": "7e7a4ebe5e78414695c3701eecf7e170a0574b2ca511a545594efa2587ea1a47",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.2-aarch64.tar.gz",
+      "build_number": "243.23654.177"
     },
     "rider": {
       "update-channel": "Rider RELEASE",
       "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz",
-      "version": "2024.3.3",
-      "sha256": "8ca14eeae6a9164da955f9e292dda788bda53a031c24ef6c2fab505e3e2f175b",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.3-aarch64.tar.gz",
-      "build_number": "243.22562.250"
+      "version": "2024.3.4",
+      "sha256": "11107efdd6d15965817709d283362f0b0c522ffdc4f8175e85180bf9b0451443",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.4-aarch64.tar.gz",
+      "build_number": "243.23654.126"
     },
     "ruby-mine": {
       "update-channel": "RubyMine RELEASE",
       "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz",
-      "version": "2024.3.2",
-      "sha256": "8d6981e056bfded160b2a14d81aaa3ca45d1b102a9f58c11578389988c8c6441",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.2-aarch64.tar.gz",
-      "build_number": "243.23654.112"
+      "version": "2024.3.2.1",
+      "sha256": "eacd0a8b9c8e5445bc52bac7094667b6d9f1973d951ae47878ced4af97c95a0b",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.2.1-aarch64.tar.gz",
+      "build_number": "243.23654.167"
     },
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz",
-      "version": "2024.3.3",
-      "sha256": "7e002489c7167f39744d746127dc7a3f06d5cfbf9d63aa6a2835b0a80a261155",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.3-aarch64.tar.gz",
-      "build_number": "243.23654.116"
+      "version": "2024.3.4",
+      "sha256": "a1b3626907930d32f256d14598e1013ce6999fae28a61f71013be2a7e7c52a1d",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.4-aarch64.tar.gz",
+      "build_number": "243.23654.180"
     },
     "webstorm": {
       "update-channel": "WebStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz",
-      "version": "2024.3.2",
-      "sha256": "9914fe6e6b5f0a7e87c9628fdf70b5083b68ec14b8873ad6847e4ea8e8c80a96",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.2-aarch64.tar.gz",
-      "build_number": "243.23654.120"
+      "version": "2024.3.2.1",
+      "sha256": "82ba3c43848e8a16ce2b9c4df4d8b3e8717e42b46328cebdcf09a51545b6a24e",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.2.1-aarch64.tar.gz",
+      "build_number": "243.23654.157"
     },
     "writerside": {
       "update-channel": "Writerside EAP",
@@ -281,10 +281,10 @@
     "aqua": {
       "update-channel": "Aqua RELEASE",
       "url-template": "https://download.jetbrains.com/aqua/aqua-{version}.dmg",
-      "version": "2024.3.1",
-      "sha256": "2efd04de1b67a394529fb154e63c58e34654af42a5fb12b5989ab8d5a784483b",
-      "url": "https://download.jetbrains.com/aqua/aqua-2024.3.1.dmg",
-      "build_number": "243.22562.238"
+      "version": "2024.3.2",
+      "sha256": "423d492e9849beb7edbbd1771650a04e8df9f469bf1789b41bc5878c84cee393",
+      "url": "https://download.jetbrains.com/aqua/aqua-2024.3.2.dmg",
+      "build_number": "243.23654.154"
     },
     "clion": {
       "update-channel": "CLion RELEASE",
@@ -313,99 +313,99 @@
     "gateway": {
       "update-channel": "Gateway RELEASE",
       "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg",
-      "version": "2024.3.1.1",
-      "sha256": "f31962a284ec68e175d6f5678c0e4fe33c0948514f92673bb7989b38c3622951",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.1.1.dmg",
-      "build_number": "243.22562.252"
+      "version": "2024.3.2",
+      "sha256": "6c3e4d0bb7b93e522be59c00243589e571d7575ae71678fa807645ea00a9dcae",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.2.dmg",
+      "build_number": "243.23654.132"
     },
     "goland": {
       "update-channel": "GoLand RELEASE",
       "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
-      "version": "2024.3.2",
-      "sha256": "a8a0567d571f5bb94fe48cba6035db054f07db87c353765c823c90cb2f9783a1",
-      "url": "https://download.jetbrains.com/go/goland-2024.3.2.dmg",
-      "build_number": "243.23654.119"
+      "version": "2024.3.2.1",
+      "sha256": "694feba07f9ded15403971396d54c94bb7e306f1d6c37a995c83d229c73218dc",
+      "url": "https://download.jetbrains.com/go/goland-2024.3.2.1.dmg",
+      "build_number": "243.23654.166"
     },
     "idea-community": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
-      "version": "2024.3.2",
-      "sha256": "d60b7148d6d0da8d3bf1d43282d282d41ea8d7b3443d8173d4dd1e692c44ce9a",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.2.dmg",
-      "build_number": "243.23654.117"
+      "version": "2024.3.2.2",
+      "sha256": "7a537dc57f88657bda1efc1d9c0ad86b3defa2c232b0cf678779ac6fcf90efa7",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.2.2.dmg",
+      "build_number": "243.23654.189"
     },
     "idea-ultimate": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
-      "version": "2024.3.2",
-      "sha256": "eaa4fc6f6aecdf023965d76f391fa5d438193d1f2fe42d6a8c2cffab7599c22b",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.2.dmg",
-      "build_number": "243.23654.117"
+      "version": "2024.3.2.2",
+      "sha256": "acedea9b54e3de575aa7679d478731d681d99b6b448230cf0c99e0b7c0cc8754",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.2.2.dmg",
+      "build_number": "243.23654.189"
     },
     "mps": {
       "update-channel": "MPS RELEASE",
       "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg",
-      "version": "2024.1.1",
-      "sha256": "85f936a8d4a610b0232f5716f364cfae6edac5322fd40714c07e9ffabb11e85a",
-      "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1.1-macos.dmg",
-      "build_number": "241.19072.1155"
+      "version": "2024.3",
+      "sha256": "a5476c8aa604f3c37c192a5301eebf1c33d2ae733be018f485f3bf48d2a52366",
+      "url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3-macos.dmg",
+      "build_number": "243.21565.447"
     },
     "phpstorm": {
       "update-channel": "PhpStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
-      "version": "2024.3.2",
-      "sha256": "df4b63e60d22a63d75f1780dc1354b570982eca6d4462ced232c2492a158d520",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.2.dmg",
-      "build_number": "243.23654.115",
+      "version": "2024.3.2.1",
+      "sha256": "d0eb3ee21d3c79cc262e0186b70c52a8d887100881b2691537744b97656ed187",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.2.1.dmg",
+      "build_number": "243.23654.168",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg",
-      "version": "2024.3.1.1",
-      "sha256": "72cf007a2f5505544b821c97b34f61f6195f32beaf3bfd032370ee7f03cb5046",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.1.1.dmg",
-      "build_number": "243.22562.220"
+      "version": "2024.3.2",
+      "sha256": "7244a81461290b1e555e5de9e00ddfad18ece5d31383a6539e0feaa1a734b233",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.2.dmg",
+      "build_number": "243.23654.177"
     },
     "pycharm-professional": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg",
-      "version": "2024.3.1.1",
-      "sha256": "d0329b017d21c25426f625c31fb9e193b9dc0be17150675c1010d3bfd27f2ca2",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.1.1.dmg",
-      "build_number": "243.22562.220"
+      "version": "2024.3.2",
+      "sha256": "71544961bab32d6dd3af554bc2af0af59e9f748fc0a7a87d6026d5aebf3a6105",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.2.dmg",
+      "build_number": "243.23654.177"
     },
     "rider": {
       "update-channel": "Rider RELEASE",
       "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
-      "version": "2024.3.3",
-      "sha256": "55e851ef7dcfde75bc8e81a9650577ffa2b3c1fed4f49c529b5bac766e8e734e",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.3.dmg",
-      "build_number": "243.22562.250"
+      "version": "2024.3.4",
+      "sha256": "7a8be161e0574cbe699b82f5bf0bd74de8d13b9ff8851f620f90c4c301469680",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.4.dmg",
+      "build_number": "243.23654.126"
     },
     "ruby-mine": {
       "update-channel": "RubyMine RELEASE",
       "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
-      "version": "2024.3.2",
-      "sha256": "a70feb35207706d25d5da7357f4e3ac0d8af63c43e6bbe0d350681745586dd2e",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.2.dmg",
-      "build_number": "243.23654.112"
+      "version": "2024.3.2.1",
+      "sha256": "93b58637964adbb7b8be9f69f64546cdf66420c3f4b9ef8548a0a3cf6c80b9c7",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.2.1.dmg",
+      "build_number": "243.23654.167"
     },
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg",
-      "version": "2024.3.3",
-      "sha256": "b33400542422d7b3a0206014347de2e7a299c76b49ebf8aa8c8728f2a995309c",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.3.dmg",
-      "build_number": "243.23654.116"
+      "version": "2024.3.4",
+      "sha256": "8a883cc59218904bdc21facf08719e4afb5f8d4c160742bf242d6dba1a35ae57",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.4.dmg",
+      "build_number": "243.23654.180"
     },
     "webstorm": {
       "update-channel": "WebStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
-      "version": "2024.3.2",
-      "sha256": "c95225ad78b1109feccf539c9005aa3ddf1388459a3af0fa49571f5643591dbd",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.2.dmg",
-      "build_number": "243.23654.120"
+      "version": "2024.3.2.1",
+      "sha256": "89a4fc730cdba15d09146d15e9f7fededef2f9ef10a748a386aaddaeb56cbe27",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.2.1.dmg",
+      "build_number": "243.23654.157"
     },
     "writerside": {
       "update-channel": "Writerside EAP",
@@ -420,10 +420,10 @@
     "aqua": {
       "update-channel": "Aqua RELEASE",
       "url-template": "https://download.jetbrains.com/aqua/aqua-{version}-aarch64.dmg",
-      "version": "2024.3.1",
-      "sha256": "ee6ae8231315aff5908d240449be182c9bab58a09ec03bc3afb302b7d7e597d2",
-      "url": "https://download.jetbrains.com/aqua/aqua-2024.3.1-aarch64.dmg",
-      "build_number": "243.22562.238"
+      "version": "2024.3.2",
+      "sha256": "43974cdbbb71aaf5bfcfaf2cfd0e69e9920dda3973e64671936c1d52b267494d",
+      "url": "https://download.jetbrains.com/aqua/aqua-2024.3.2-aarch64.dmg",
+      "build_number": "243.23654.154"
     },
     "clion": {
       "update-channel": "CLion RELEASE",
@@ -452,99 +452,99 @@
     "gateway": {
       "update-channel": "Gateway RELEASE",
       "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg",
-      "version": "2024.3.1.1",
-      "sha256": "f4ff084d4054f75d3b10110b2abaddecbac30204d80c39dcb7a5925f2278c41a",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.1.1-aarch64.dmg",
-      "build_number": "243.22562.252"
+      "version": "2024.3.2",
+      "sha256": "a8a36e25cf011941156344bc6b6f7f6b6de8e6905a2ad0c3d8106dda6b40342f",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2024.3.2-aarch64.dmg",
+      "build_number": "243.23654.132"
     },
     "goland": {
       "update-channel": "GoLand RELEASE",
       "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
-      "version": "2024.3.2",
-      "sha256": "75579b5b6815d3f365c72b18d0455eb8402ae0a53d714e2776a75716383d402e",
-      "url": "https://download.jetbrains.com/go/goland-2024.3.2-aarch64.dmg",
-      "build_number": "243.23654.119"
+      "version": "2024.3.2.1",
+      "sha256": "d93f3bd0ca598f37032110275336c98c5aa46ef566e51e2d290b986416e4bd7a",
+      "url": "https://download.jetbrains.com/go/goland-2024.3.2.1-aarch64.dmg",
+      "build_number": "243.23654.166"
     },
     "idea-community": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
-      "version": "2024.3.2",
-      "sha256": "1cc440d163460d345aa31ccb9ca9309218f4f887ceddcd8eddf96d09b0218250",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.2-aarch64.dmg",
-      "build_number": "243.23654.117"
+      "version": "2024.3.2.2",
+      "sha256": "8a0435dabe4ff169430b46d119afcaa053b8d7d8d5d6a666e56292f6d470a2c7",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2024.3.2.2-aarch64.dmg",
+      "build_number": "243.23654.189"
     },
     "idea-ultimate": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
-      "version": "2024.3.2",
-      "sha256": "60c96ca67507f811d66ac1fa42a2a93d3310c4457f32689a6e10d0a04e6bc34a",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.2-aarch64.dmg",
-      "build_number": "243.23654.117"
+      "version": "2024.3.2.2",
+      "sha256": "da5e9c6ea95d1709e1602efeb5736d8daf2c5d108c9e04e544eb30bd6c2dac11",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2024.3.2.2-aarch64.dmg",
+      "build_number": "243.23654.189"
     },
     "mps": {
       "update-channel": "MPS RELEASE",
       "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg",
-      "version": "2024.1.1",
-      "url": "https://download.jetbrains.com/mps/2024.1/MPS-2024.1.1-macos-aarch64.dmg",
-      "sha256": "381b6c527f444ca2ea652054e172afee2096c29ad445cec7fa7fe6432cb41bea",
-      "build_number": "241.19072.1155"
+      "version": "2024.3",
+      "url": "https://download.jetbrains.com/mps/2024.3/MPS-2024.3-macos-aarch64.dmg",
+      "sha256": "9c7118db757ba4fa7b6725efa5b006f4e6db47ca2b2948a92e43c435329c9c79",
+      "build_number": "243.21565.447"
     },
     "phpstorm": {
       "update-channel": "PhpStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
-      "version": "2024.3.2",
-      "sha256": "0fcec802f70143b926db9ce7700331dadf85063ea310cbb0360bc7428ec385bf",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.2-aarch64.dmg",
-      "build_number": "243.23654.115",
+      "version": "2024.3.2.1",
+      "sha256": "42d0243042485928bc2a3c390e78d7de721c8a54b388e5ae8cff0d8982aaa521",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2024.3.2.1-aarch64.dmg",
+      "build_number": "243.23654.168",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg",
-      "version": "2024.3.1.1",
-      "sha256": "ad894fdd3f56260afde718bf8f8dd342780e5a5ecfdbf3c66772a4e1562376fe",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.1.1-aarch64.dmg",
-      "build_number": "243.22562.220"
+      "version": "2024.3.2",
+      "sha256": "855440e5a38705d8cd1d0d6b5d3fe4817fdfde62fd1bc934c51de16cd6227ba9",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2024.3.2-aarch64.dmg",
+      "build_number": "243.23654.177"
     },
     "pycharm-professional": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg",
-      "version": "2024.3.1.1",
-      "sha256": "b2afcf6bb9a9a2fb6c516815ce08073429ea506f44c7cafa9503c59da310caae",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.1.1-aarch64.dmg",
-      "build_number": "243.22562.220"
+      "version": "2024.3.2",
+      "sha256": "793c9c03a6c4d3c6446a0f068a5d8e0fd3611e096aabc04918ae0daf739c134d",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2024.3.2-aarch64.dmg",
+      "build_number": "243.23654.177"
     },
     "rider": {
       "update-channel": "Rider RELEASE",
       "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
-      "version": "2024.3.3",
-      "sha256": "139f8444b48c89745216616bc7a263259a95105892233651fb08b14cc18953a1",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.3-aarch64.dmg",
-      "build_number": "243.22562.250"
+      "version": "2024.3.4",
+      "sha256": "6d0439fb5ce9364ceab5b839aafd1f904ccda99483b4e8f3d41ffbcb8469afe7",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2024.3.4-aarch64.dmg",
+      "build_number": "243.23654.126"
     },
     "ruby-mine": {
       "update-channel": "RubyMine RELEASE",
       "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
-      "version": "2024.3.2",
-      "sha256": "c2285b17539f77667897dc2534182f0d9f1e8f8cd48c970f1ea9fa37b38704ce",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.2-aarch64.dmg",
-      "build_number": "243.23654.112"
+      "version": "2024.3.2.1",
+      "sha256": "68235be97430c0e2e18b7bdc997604b63c092fa9f0e6529f11d488c44167fb51",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2024.3.2.1-aarch64.dmg",
+      "build_number": "243.23654.167"
     },
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg",
-      "version": "2024.3.3",
-      "sha256": "0777399d545ff01a4c65fde3eaa7917556b60d1cc474a29dc68bb20fcf717575",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.3-aarch64.dmg",
-      "build_number": "243.23654.116"
+      "version": "2024.3.4",
+      "sha256": "32687e28d478ec052444578c4625d441265896e3e297c46b5474d2050663ad37",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2024.3.4-aarch64.dmg",
+      "build_number": "243.23654.180"
     },
     "webstorm": {
       "update-channel": "WebStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
-      "version": "2024.3.2",
-      "sha256": "de4ac18cf6002b7540a9fe3ec5c774cd4cf4021bf57893164e38971ec1efc2b4",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.2-aarch64.dmg",
-      "build_number": "243.23654.120"
+      "version": "2024.3.2.1",
+      "sha256": "cc69e6ec0ecf8ecfae47afd17240637a89da8a51a3f77698bd08c611b8d1a9e8",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.2.1-aarch64.dmg",
+      "build_number": "243.23654.157"
     },
     "writerside": {
       "update-channel": "Writerside EAP",

From d9f46e90643db76782c3ac79aa190b338e383f6c Mon Sep 17 00:00:00 2001
From: James Ward <james@jamesward.com>
Date: Wed, 29 Jan 2025 12:48:37 -0700
Subject: [PATCH 38/76] jetbrains.plugins: update

---
 .../editors/jetbrains/plugins/plugins.json    | 421 +++++++++---------
 1 file changed, 219 insertions(+), 202 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json
index 43621fad545b..4ec97b6e54d9 100644
--- a/pkgs/applications/editors/jetbrains/plugins/plugins.json
+++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json
@@ -17,17 +17,18 @@
         "webstorm"
       ],
       "builds": {
-        "241.19072.1155": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
+        "243.21565.447": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip",
         "243.22562.218": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip",
         "243.22562.220": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip",
-        "243.22562.250": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip",
-        "243.23654.112": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip",
         "243.23654.114": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip",
-        "243.23654.115": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip",
-        "243.23654.116": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip",
-        "243.23654.117": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip",
-        "243.23654.119": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip",
-        "243.23654.120": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip",
+        "243.23654.126": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip",
+        "243.23654.157": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip",
+        "243.23654.166": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip",
+        "243.23654.167": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip",
+        "243.23654.168": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip",
+        "243.23654.177": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip",
+        "243.23654.180": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip",
+        "243.23654.189": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip",
         "243.23654.19": "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip"
       },
       "name": "ideavim"
@@ -37,7 +38,7 @@
         "idea-ultimate"
       ],
       "builds": {
-        "243.23654.117": "https://plugins.jetbrains.com/files/631/666772/python-243.23654.117.zip"
+        "243.23654.189": "https://plugins.jetbrains.com/files/631/673131/python-243.23654.189.zip"
       },
       "name": "python"
     },
@@ -48,7 +49,7 @@
       ],
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/1347/667258/scala-intellij-bin-2024.3.35.zip",
-        "243.23654.117": "https://plugins.jetbrains.com/files/1347/667258/scala-intellij-bin-2024.3.35.zip"
+        "243.23654.189": "https://plugins.jetbrains.com/files/1347/667258/scala-intellij-bin-2024.3.35.zip"
       },
       "name": "scala"
     },
@@ -69,17 +70,18 @@
         "webstorm"
       ],
       "builds": {
-        "241.19072.1155": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+        "243.21565.447": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
         "243.22562.218": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
         "243.22562.220": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
-        "243.22562.250": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
-        "243.23654.112": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
         "243.23654.114": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
-        "243.23654.115": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
-        "243.23654.116": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
-        "243.23654.117": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
-        "243.23654.119": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
-        "243.23654.120": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+        "243.23654.126": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+        "243.23654.157": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+        "243.23654.166": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+        "243.23654.167": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+        "243.23654.168": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+        "243.23654.177": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+        "243.23654.180": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
+        "243.23654.189": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip",
         "243.23654.19": "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip"
       },
       "name": "string-manipulation"
@@ -101,17 +103,18 @@
         "webstorm"
       ],
       "builds": {
-        "241.19072.1155": null,
+        "243.21565.447": null,
         "243.22562.218": null,
         "243.22562.220": null,
-        "243.22562.250": null,
-        "243.23654.112": null,
         "243.23654.114": null,
-        "243.23654.115": null,
-        "243.23654.116": null,
-        "243.23654.117": null,
-        "243.23654.119": null,
-        "243.23654.120": null,
+        "243.23654.126": null,
+        "243.23654.157": null,
+        "243.23654.166": null,
+        "243.23654.167": null,
+        "243.23654.168": null,
+        "243.23654.177": null,
+        "243.23654.180": null,
+        "243.23654.189": null,
         "243.23654.19": null
       },
       "name": "kotlin"
@@ -133,18 +136,19 @@
         "webstorm"
       ],
       "builds": {
-        "241.19072.1155": null,
+        "243.21565.447": "https://plugins.jetbrains.com/files/6981/633889/ini-243.21565.208.zip",
         "243.22562.218": "https://plugins.jetbrains.com/files/6981/654905/ini-243.22562.236.zip",
         "243.22562.220": "https://plugins.jetbrains.com/files/6981/654905/ini-243.22562.236.zip",
-        "243.22562.250": "https://plugins.jetbrains.com/files/6981/654905/ini-243.22562.236.zip",
-        "243.23654.112": "https://plugins.jetbrains.com/files/6981/667161/ini-243.23654.119.zip",
-        "243.23654.114": "https://plugins.jetbrains.com/files/6981/667161/ini-243.23654.119.zip",
-        "243.23654.115": "https://plugins.jetbrains.com/files/6981/667161/ini-243.23654.119.zip",
-        "243.23654.116": "https://plugins.jetbrains.com/files/6981/667161/ini-243.23654.119.zip",
-        "243.23654.117": "https://plugins.jetbrains.com/files/6981/667161/ini-243.23654.119.zip",
-        "243.23654.119": "https://plugins.jetbrains.com/files/6981/667161/ini-243.23654.119.zip",
-        "243.23654.120": "https://plugins.jetbrains.com/files/6981/667161/ini-243.23654.119.zip",
-        "243.23654.19": "https://plugins.jetbrains.com/files/6981/667161/ini-243.23654.119.zip"
+        "243.23654.114": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip",
+        "243.23654.126": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip",
+        "243.23654.157": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip",
+        "243.23654.166": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip",
+        "243.23654.167": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip",
+        "243.23654.168": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip",
+        "243.23654.177": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip",
+        "243.23654.180": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip",
+        "243.23654.189": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip",
+        "243.23654.19": "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip"
       },
       "name": "ini"
     },
@@ -165,17 +169,18 @@
         "webstorm"
       ],
       "builds": {
-        "241.19072.1155": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
+        "243.21565.447": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
         "243.22562.218": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
         "243.22562.220": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
-        "243.22562.250": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
-        "243.23654.112": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
         "243.23654.114": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
-        "243.23654.115": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
-        "243.23654.116": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
-        "243.23654.117": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
-        "243.23654.119": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
-        "243.23654.120": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
+        "243.23654.126": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
+        "243.23654.157": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
+        "243.23654.166": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
+        "243.23654.167": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
+        "243.23654.168": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
+        "243.23654.177": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
+        "243.23654.180": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
+        "243.23654.189": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip",
         "243.23654.19": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip"
       },
       "name": "acejump"
@@ -186,8 +191,8 @@
         "phpstorm"
       ],
       "builds": {
-        "243.23654.115": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip",
-        "243.23654.117": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip"
+        "243.23654.168": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip",
+        "243.23654.189": "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip"
       },
       "name": "symfony-support"
     },
@@ -197,8 +202,8 @@
         "phpstorm"
       ],
       "builds": {
-        "243.23654.115": "https://plugins.jetbrains.com/files/7320/630497/PHP_Annotations-11.1.1.zip",
-        "243.23654.117": "https://plugins.jetbrains.com/files/7320/630497/PHP_Annotations-11.1.1.zip"
+        "243.23654.168": "https://plugins.jetbrains.com/files/7320/630497/PHP_Annotations-11.1.1.zip",
+        "243.23654.189": "https://plugins.jetbrains.com/files/7320/630497/PHP_Annotations-11.1.1.zip"
       },
       "name": "php-annotations"
     },
@@ -217,13 +222,14 @@
       "builds": {
         "243.22562.218": "https://plugins.jetbrains.com/files/7322/646590/python-ce-243.22562.145.zip",
         "243.22562.220": "https://plugins.jetbrains.com/files/7322/646590/python-ce-243.22562.145.zip",
-        "243.22562.250": "https://plugins.jetbrains.com/files/7322/646590/python-ce-243.22562.145.zip",
-        "243.23654.114": "https://plugins.jetbrains.com/files/7322/666773/python-ce-243.23654.117.zip",
-        "243.23654.116": "https://plugins.jetbrains.com/files/7322/666773/python-ce-243.23654.117.zip",
-        "243.23654.117": "https://plugins.jetbrains.com/files/7322/666773/python-ce-243.23654.117.zip",
-        "243.23654.119": "https://plugins.jetbrains.com/files/7322/666773/python-ce-243.23654.117.zip",
-        "243.23654.120": "https://plugins.jetbrains.com/files/7322/666773/python-ce-243.23654.117.zip",
-        "243.23654.19": "https://plugins.jetbrains.com/files/7322/666773/python-ce-243.23654.117.zip"
+        "243.23654.114": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip",
+        "243.23654.126": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip",
+        "243.23654.157": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip",
+        "243.23654.166": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip",
+        "243.23654.177": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip",
+        "243.23654.180": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip",
+        "243.23654.189": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip",
+        "243.23654.19": "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip"
       },
       "name": "python-community-edition"
     },
@@ -244,17 +250,18 @@
         "webstorm"
       ],
       "builds": {
-        "241.19072.1155": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip",
+        "243.21565.447": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip",
         "243.22562.218": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip",
         "243.22562.220": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip",
-        "243.22562.250": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip",
-        "243.23654.112": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip",
         "243.23654.114": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip",
-        "243.23654.115": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip",
-        "243.23654.116": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip",
-        "243.23654.117": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip",
-        "243.23654.119": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip",
-        "243.23654.120": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip",
+        "243.23654.126": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip",
+        "243.23654.157": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip",
+        "243.23654.166": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip",
+        "243.23654.167": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip",
+        "243.23654.168": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip",
+        "243.23654.177": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip",
+        "243.23654.180": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip",
+        "243.23654.189": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip",
         "243.23654.19": "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip"
       },
       "name": "asciidoc"
@@ -275,16 +282,17 @@
         "webstorm"
       ],
       "builds": {
-        "241.19072.1155": null,
+        "243.21565.447": null,
         "243.22562.218": null,
         "243.22562.220": null,
-        "243.22562.250": null,
-        "243.23654.112": null,
         "243.23654.114": null,
-        "243.23654.115": null,
-        "243.23654.117": null,
-        "243.23654.119": null,
-        "243.23654.120": null,
+        "243.23654.126": null,
+        "243.23654.157": null,
+        "243.23654.166": null,
+        "243.23654.167": null,
+        "243.23654.168": null,
+        "243.23654.177": null,
+        "243.23654.189": null,
         "243.23654.19": null
       },
       "name": "-deprecated-rust"
@@ -305,16 +313,17 @@
         "webstorm"
       ],
       "builds": {
-        "241.19072.1155": null,
+        "243.21565.447": null,
         "243.22562.218": null,
         "243.22562.220": null,
-        "243.22562.250": null,
-        "243.23654.112": null,
         "243.23654.114": null,
-        "243.23654.115": null,
-        "243.23654.117": null,
-        "243.23654.119": null,
-        "243.23654.120": null,
+        "243.23654.126": null,
+        "243.23654.157": null,
+        "243.23654.166": null,
+        "243.23654.167": null,
+        "243.23654.168": null,
+        "243.23654.177": null,
+        "243.23654.189": null,
         "243.23654.19": null
       },
       "name": "-deprecated-rust-beta"
@@ -336,18 +345,19 @@
         "webstorm"
       ],
       "builds": {
-        "241.19072.1155": null,
+        "243.21565.447": "https://plugins.jetbrains.com/files/8554/633920/featuresTrainer-243.21565.204.zip",
         "243.22562.218": "https://plugins.jetbrains.com/files/8554/654690/featuresTrainer-243.22562.233.zip",
         "243.22562.220": "https://plugins.jetbrains.com/files/8554/654690/featuresTrainer-243.22562.233.zip",
-        "243.22562.250": "https://plugins.jetbrains.com/files/8554/654690/featuresTrainer-243.22562.233.zip",
-        "243.23654.112": "https://plugins.jetbrains.com/files/8554/666817/featuresTrainer-243.23654.115.zip",
-        "243.23654.114": "https://plugins.jetbrains.com/files/8554/666817/featuresTrainer-243.23654.115.zip",
-        "243.23654.115": "https://plugins.jetbrains.com/files/8554/666817/featuresTrainer-243.23654.115.zip",
-        "243.23654.116": "https://plugins.jetbrains.com/files/8554/666817/featuresTrainer-243.23654.115.zip",
-        "243.23654.117": "https://plugins.jetbrains.com/files/8554/666817/featuresTrainer-243.23654.115.zip",
-        "243.23654.119": "https://plugins.jetbrains.com/files/8554/666817/featuresTrainer-243.23654.115.zip",
-        "243.23654.120": "https://plugins.jetbrains.com/files/8554/666817/featuresTrainer-243.23654.115.zip",
-        "243.23654.19": "https://plugins.jetbrains.com/files/8554/666817/featuresTrainer-243.23654.115.zip"
+        "243.23654.114": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip",
+        "243.23654.126": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip",
+        "243.23654.157": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip",
+        "243.23654.166": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip",
+        "243.23654.167": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip",
+        "243.23654.168": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip",
+        "243.23654.177": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip",
+        "243.23654.180": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip",
+        "243.23654.189": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip",
+        "243.23654.19": "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip"
       },
       "name": "ide-features-trainer"
     },
@@ -368,17 +378,18 @@
         "webstorm"
       ],
       "builds": {
-        "241.19072.1155": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
+        "243.21565.447": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
         "243.22562.218": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
         "243.22562.220": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
-        "243.22562.250": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
-        "243.23654.112": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
         "243.23654.114": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
-        "243.23654.115": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
-        "243.23654.116": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
-        "243.23654.117": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
-        "243.23654.119": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
-        "243.23654.120": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
+        "243.23654.126": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
+        "243.23654.157": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
+        "243.23654.166": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
+        "243.23654.167": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
+        "243.23654.168": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
+        "243.23654.177": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
+        "243.23654.180": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
+        "243.23654.189": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
         "243.23654.19": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip"
       },
       "name": "nixidea"
@@ -389,8 +400,8 @@
         "idea-ultimate"
       ],
       "builds": {
-        "243.23654.117": "https://plugins.jetbrains.com/files/9568/666746/go-plugin-243.23654.117.zip",
-        "243.23654.119": "https://plugins.jetbrains.com/files/9568/666746/go-plugin-243.23654.117.zip"
+        "243.23654.166": "https://plugins.jetbrains.com/files/9568/666746/go-plugin-243.23654.117.zip",
+        "243.23654.189": "https://plugins.jetbrains.com/files/9568/666746/go-plugin-243.23654.117.zip"
       },
       "name": "go"
     },
@@ -411,17 +422,18 @@
         "webstorm"
       ],
       "builds": {
-        "241.19072.1155": "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip",
+        "243.21565.447": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
         "243.22562.218": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
         "243.22562.220": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
-        "243.22562.250": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
-        "243.23654.112": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
         "243.23654.114": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
-        "243.23654.115": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
-        "243.23654.116": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
-        "243.23654.117": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
-        "243.23654.119": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
-        "243.23654.120": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
+        "243.23654.126": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
+        "243.23654.157": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
+        "243.23654.166": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
+        "243.23654.167": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
+        "243.23654.168": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
+        "243.23654.177": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
+        "243.23654.180": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
+        "243.23654.189": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip",
         "243.23654.19": "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip"
       },
       "name": "csv-editor"
@@ -443,18 +455,19 @@
         "webstorm"
       ],
       "builds": {
-        "241.19072.1155": "https://plugins.jetbrains.com/files/11349/666864/aws-toolkit-jetbrains-standalone-3.48-241.zip",
-        "243.22562.218": "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip",
-        "243.22562.220": "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip",
-        "243.22562.250": "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip",
-        "243.23654.112": "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip",
-        "243.23654.114": "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip",
-        "243.23654.115": "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip",
-        "243.23654.116": "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip",
-        "243.23654.117": "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip",
-        "243.23654.119": "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip",
-        "243.23654.120": "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip",
-        "243.23654.19": "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip"
+        "243.21565.447": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip",
+        "243.22562.218": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip",
+        "243.22562.220": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip",
+        "243.23654.114": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip",
+        "243.23654.126": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip",
+        "243.23654.157": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip",
+        "243.23654.166": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip",
+        "243.23654.167": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip",
+        "243.23654.168": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip",
+        "243.23654.177": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip",
+        "243.23654.180": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip",
+        "243.23654.189": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip",
+        "243.23654.19": "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip"
       },
       "name": "aws-toolkit"
     },
@@ -475,17 +488,18 @@
         "webstorm"
       ],
       "builds": {
-        "241.19072.1155": null,
+        "243.21565.447": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
         "243.22562.218": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
         "243.22562.220": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
-        "243.22562.250": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
-        "243.23654.112": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
         "243.23654.114": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
-        "243.23654.115": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
-        "243.23654.116": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
-        "243.23654.117": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
-        "243.23654.119": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
-        "243.23654.120": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
+        "243.23654.126": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
+        "243.23654.157": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
+        "243.23654.166": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
+        "243.23654.167": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
+        "243.23654.168": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
+        "243.23654.177": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
+        "243.23654.180": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
+        "243.23654.189": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip",
         "243.23654.19": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip"
       },
       "name": "vscode-keymap"
@@ -507,17 +521,18 @@
         "webstorm"
       ],
       "builds": {
-        "241.19072.1155": null,
+        "243.21565.447": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
         "243.22562.218": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
         "243.22562.220": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
-        "243.22562.250": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
-        "243.23654.112": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
         "243.23654.114": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
-        "243.23654.115": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
-        "243.23654.116": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
-        "243.23654.117": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
-        "243.23654.119": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
-        "243.23654.120": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
+        "243.23654.126": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
+        "243.23654.157": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
+        "243.23654.166": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
+        "243.23654.167": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
+        "243.23654.168": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
+        "243.23654.177": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
+        "243.23654.180": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
+        "243.23654.189": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip",
         "243.23654.19": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip"
       },
       "name": "eclipse-keymap"
@@ -539,17 +554,18 @@
         "webstorm"
       ],
       "builds": {
-        "241.19072.1155": null,
+        "243.21565.447": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
         "243.22562.218": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
         "243.22562.220": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
-        "243.22562.250": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
-        "243.23654.112": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
         "243.23654.114": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
-        "243.23654.115": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
-        "243.23654.116": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
-        "243.23654.117": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
-        "243.23654.119": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
-        "243.23654.120": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
+        "243.23654.126": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
+        "243.23654.157": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
+        "243.23654.166": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
+        "243.23654.167": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
+        "243.23654.168": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
+        "243.23654.177": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
+        "243.23654.180": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
+        "243.23654.189": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip",
         "243.23654.19": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip"
       },
       "name": "visual-studio-keymap"
@@ -571,17 +587,18 @@
         "webstorm"
       ],
       "builds": {
-        "241.19072.1155": null,
+        "243.21565.447": "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip",
         "243.22562.218": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip",
         "243.22562.220": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip",
-        "243.22562.250": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip",
-        "243.23654.112": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip",
         "243.23654.114": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip",
-        "243.23654.115": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip",
-        "243.23654.116": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip",
-        "243.23654.117": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip",
-        "243.23654.119": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip",
-        "243.23654.120": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip",
+        "243.23654.126": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip",
+        "243.23654.157": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip",
+        "243.23654.166": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip",
+        "243.23654.167": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip",
+        "243.23654.168": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip",
+        "243.23654.177": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip",
+        "243.23654.180": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip",
+        "243.23654.189": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip",
         "243.23654.19": "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip"
       },
       "name": "protocol-buffers"
@@ -603,17 +620,18 @@
         "webstorm"
       ],
       "builds": {
-        "241.19072.1155": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "243.21565.447": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
         "243.22562.218": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
         "243.22562.220": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "243.22562.250": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "243.23654.112": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
         "243.23654.114": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "243.23654.115": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "243.23654.116": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "243.23654.117": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "243.23654.119": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "243.23654.120": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "243.23654.126": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "243.23654.157": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "243.23654.166": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "243.23654.167": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "243.23654.168": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "243.23654.177": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "243.23654.180": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "243.23654.189": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
         "243.23654.19": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
       },
       "name": "darcula-pitch-black"
@@ -635,18 +653,19 @@
         "webstorm"
       ],
       "builds": {
-        "241.19072.1155": "https://plugins.jetbrains.com/files/17718/654596/github-copilot-intellij-1.5.30-231.zip",
-        "243.22562.218": "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip",
-        "243.22562.220": "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip",
-        "243.22562.250": "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip",
-        "243.23654.112": "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip",
-        "243.23654.114": "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip",
-        "243.23654.115": "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip",
-        "243.23654.116": "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip",
-        "243.23654.117": "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip",
-        "243.23654.119": "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip",
-        "243.23654.120": "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip",
-        "243.23654.19": "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip"
+        "243.21565.447": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip",
+        "243.22562.218": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip",
+        "243.22562.220": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip",
+        "243.23654.114": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip",
+        "243.23654.126": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip",
+        "243.23654.157": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip",
+        "243.23654.166": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip",
+        "243.23654.167": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip",
+        "243.23654.168": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip",
+        "243.23654.177": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip",
+        "243.23654.180": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip",
+        "243.23654.189": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip",
+        "243.23654.19": "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip"
       },
       "name": "github-copilot"
     },
@@ -667,17 +686,18 @@
         "webstorm"
       ],
       "builds": {
-        "241.19072.1155": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "243.21565.447": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
         "243.22562.218": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
         "243.22562.220": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "243.22562.250": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "243.23654.112": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
         "243.23654.114": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "243.23654.115": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "243.23654.116": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "243.23654.117": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "243.23654.119": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "243.23654.120": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "243.23654.126": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "243.23654.157": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "243.23654.166": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "243.23654.167": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "243.23654.168": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "243.23654.177": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "243.23654.180": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "243.23654.189": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
         "243.23654.19": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
       },
       "name": "netbeans-6-5-keymap"
@@ -699,17 +719,18 @@
         "webstorm"
       ],
       "builds": {
-        "241.19072.1155": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
+        "243.21565.447": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
         "243.22562.218": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
         "243.22562.220": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
-        "243.22562.250": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
-        "243.23654.112": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
         "243.23654.114": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
-        "243.23654.115": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
-        "243.23654.116": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
-        "243.23654.117": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
-        "243.23654.119": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
-        "243.23654.120": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
+        "243.23654.126": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
+        "243.23654.157": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
+        "243.23654.166": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
+        "243.23654.167": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
+        "243.23654.168": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
+        "243.23654.177": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
+        "243.23654.180": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
+        "243.23654.189": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip",
         "243.23654.19": "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip"
       },
       "name": "mermaid"
@@ -721,46 +742,42 @@
         "rust-rover"
       ],
       "builds": {
-        "243.23654.114": "https://plugins.jetbrains.com/files/22407/666537/intellij-rust-243.23654.116.zip",
-        "243.23654.116": "https://plugins.jetbrains.com/files/22407/666537/intellij-rust-243.23654.116.zip",
-        "243.23654.117": "https://plugins.jetbrains.com/files/22407/666537/intellij-rust-243.23654.116.zip"
+        "243.23654.114": "https://plugins.jetbrains.com/files/22407/672481/intellij-rust-243.23654.180.zip",
+        "243.23654.180": "https://plugins.jetbrains.com/files/22407/672481/intellij-rust-243.23654.180.zip",
+        "243.23654.189": "https://plugins.jetbrains.com/files/22407/672481/intellij-rust-243.23654.180.zip"
       },
       "name": "rust"
     }
   },
   "files": {
-    "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip": "sha256-QwguD4ENrL7GxmX+CGEyCPowbAPNpYgntVGAbHxOlyQ=",
     "https://plugins.jetbrains.com/files/10037/658496/intellij-csv-validator-4.0.2.zip": "sha256-frvQ+Dm1ueID6+vNlja0HtecGyn+ppq9GTgmU3kQ+58=",
-    "https://plugins.jetbrains.com/files/11349/666864/aws-toolkit-jetbrains-standalone-3.48-241.zip": "sha256-2bz6CZQr+pQ5Sl+zhBnfKBQMyTF5wBk+Xk3Y+wh5c48=",
-    "https://plugins.jetbrains.com/files/11349/666866/aws-toolkit-jetbrains-standalone-3.48-243.zip": "sha256-jKcanbs0qobJebe4onrSY43xp6V7ViAOVZNEMyaSvkY=",
+    "https://plugins.jetbrains.com/files/11349/670543/aws-toolkit-jetbrains-standalone-3.50-243.zip": "sha256-Jr+Oe7LbC5QW/sxevoq/uasKGT7rwgI+uiVHYdoBkQM=",
     "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip": "sha256-phv8MTGKNGzRviKzX+nIVTbkX4WkU82QVO5zXUQLtAo=",
     "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip": "sha256-/g1ucT18ywVJnCePH7WyMWKgM9umowBz5wFObmO7cws=",
     "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip": "sha256-VQqK0Cm9ddXN63KYIqimuGOh7EB9VvdlErp/VrWx8SA=",
     "https://plugins.jetbrains.com/files/1347/667258/scala-intellij-bin-2024.3.35.zip": "sha256-4I75KqXyFl73S63O+00usrg8QBcuBRBgfjRmCQMpNks=",
+    "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip": "sha256-cv6JTujoD5g90ngXTtnj5x31wjbIZlKZ6Zn0H+vHCTk=",
     "https://plugins.jetbrains.com/files/14004/636643/protoeditor-243.22562.13.zip": "sha256-Tgu8CfDhO6KugfuLNhmxe89dMm+Qo3fmAg/8hwjUaoc=",
     "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=",
-    "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip": "sha256-uMIrYoZE16X/K96HuDJx8QMh6wUbi4+qSw+HJAq7ukI=",
     "https://plugins.jetbrains.com/files/164/666347/IdeaVIM-2.18.1.zip": "sha256-wkh88imoNLt9Q7M6chu28+e0EhudpVGN4ZhvfSdj/l4=",
-    "https://plugins.jetbrains.com/files/17718/654596/github-copilot-intellij-1.5.30-231.zip": "sha256-xrZJBCGPT1s5+fyWsMSEC69vILM+BkKef2wKxzbTCM4=",
-    "https://plugins.jetbrains.com/files/17718/654597/github-copilot-intellij-1.5.30-242.zip": "sha256-bWrtG3cE6qAqXiQ4mtgRLutt8XaTqts+kyClDWVcMO4=",
+    "https://plugins.jetbrains.com/files/17718/671850/github-copilot-intellij-1.5.32-242.zip": "sha256-WJxjcazelBgNBusqiv9ws9XhtszKpdk+8iNV+jP+ros=",
     "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=",
-    "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip": "sha256-DUiIQYIzYoXmgtBakSLtMB+xxJMaR70Jgg9erySa3wQ=",
     "https://plugins.jetbrains.com/files/20146/633971/Mermaid-0.0.24_IJ.243.zip": "sha256-jGWRU0g120qYvvFiUFI10zvprTsemuIq3XmIjYxZGts=",
     "https://plugins.jetbrains.com/files/2162/640476/StringManipulation-9.15.0.zip": "sha256-TZPup3EJ0cBv4i2eVAQwVmmzy0rmt4KptEsk3C7baEM=",
-    "https://plugins.jetbrains.com/files/22407/666537/intellij-rust-243.23654.116.zip": "sha256-abOkEYViOYFht9hk4KhqANfk63q4rp3ywenXeKj2ovQ=",
-    "https://plugins.jetbrains.com/files/631/666772/python-243.23654.117.zip": "sha256-UGGhKZGlnq+MrTWfpb3eiIGkLkJE77V4sLKZi16oATU=",
+    "https://plugins.jetbrains.com/files/22407/672481/intellij-rust-243.23654.180.zip": "sha256-9MB+kR8GZePzVU6i9sr+vFyeGqGnXwGRThTv6lKouVU=",
+    "https://plugins.jetbrains.com/files/631/673131/python-243.23654.189.zip": "sha256-4uuHNZhmSh+vqARBZ+ilRmkYnr0otZdgeZUPziv+lQc=",
+    "https://plugins.jetbrains.com/files/6981/633889/ini-243.21565.208.zip": "sha256-CJjUYj3GR9MrNhrejrxJ4reZX/80XQ+gkZffFKd0nhc=",
     "https://plugins.jetbrains.com/files/6981/654905/ini-243.22562.236.zip": "sha256-kL/A2R8j2JKMU61T/xJahPwKPYmwFCFy55NPSoBh/Xc=",
-    "https://plugins.jetbrains.com/files/6981/667161/ini-243.23654.119.zip": "sha256-MhN7iARzX/xB3H1sC5T2A3psMNDmws0QGhQOUqhGlIc=",
+    "https://plugins.jetbrains.com/files/6981/672286/ini-243.23654.177.zip": "sha256-5IgVW7Aa+eVh5hUF7/Qa1g7nQtkAQkFKyGY5ROr/5fM=",
     "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip": "sha256-kVUEgfEKUupV/qlB4Dpzi5pFHjhVvX74XIPetKtjysM=",
-    "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip": "sha256-Qp24juITBXEF5izdzayWq28Ioy4/kgT0qz6snZ0dND0=",
     "https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip": "sha256-drNmhJMe+kuY2fcHjY+SQmkACvFk0rVI4vAhyZ/bgLc=",
     "https://plugins.jetbrains.com/files/7320/630497/PHP_Annotations-11.1.1.zip": "sha256-05aBYbqNIuwe/JTwntFdIqML8NHbTOwVusl1P9FzuYY=",
     "https://plugins.jetbrains.com/files/7322/646590/python-ce-243.22562.145.zip": "sha256-45UtQRZMtKF6addrrB3A+goeyICMfcZ2FKcJvJSqgg4=",
-    "https://plugins.jetbrains.com/files/7322/666773/python-ce-243.23654.117.zip": "sha256-l6ePJtwdj6+k7Qvpus9zGqIs141eT0/qTeZL0Ud4rM0=",
-    "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip": "sha256-oKczkLHAk2bJRNRgToVe0ySEJGF8+P4oWqQ33olwzWw=",
+    "https://plugins.jetbrains.com/files/7322/673130/python-ce-243.23654.189.zip": "sha256-7P9JsxCDWUf0HPHZNPjoF8Ivh3Ks7AO5s2kWm+Cq9j4=",
     "https://plugins.jetbrains.com/files/7391/658997/asciidoctor-intellij-plugin-0.43.6.zip": "sha256-3RJ7YVFtynyqeLIzdrirCMbWNZmUkJ+DT/9my71H0Dk=",
+    "https://plugins.jetbrains.com/files/8554/633920/featuresTrainer-243.21565.204.zip": "sha256-3MCG1SNEy2Mf9r+nTLcRwJ+rIJRvtO0kYKFNjIan86E=",
     "https://plugins.jetbrains.com/files/8554/654690/featuresTrainer-243.22562.233.zip": "sha256-JugbJM8Lr2kbhP9hdLE3kUStl2vOMUB5wGTwNLxAZd0=",
-    "https://plugins.jetbrains.com/files/8554/666817/featuresTrainer-243.23654.115.zip": "sha256-3HiNFTBJ1b/6IvMMkMCmNVo/4VMtTTKeiC6XqR6LIUs=",
+    "https://plugins.jetbrains.com/files/8554/672476/featuresTrainer-243.23654.180.zip": "sha256-YRf5sj+quf/dQv6eFU6f190vWW+RHtyGS+S2a6DhUoM=",
     "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip": "sha256-9GMqs/hSavcw1E4ZJTLDH1lx3HEeQ5NR8BT+Q9pN3io=",
     "https://plugins.jetbrains.com/files/9568/666746/go-plugin-243.23654.117.zip": "sha256-8Y7JyjX8ytias4ix1azWkhPEVYXDomWRiMQlrKco9zM="
   }

From bb3bba296982368561f4d625d6371625459b6491 Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Wed, 29 Jan 2025 21:41:06 +0100
Subject: [PATCH 39/76] epson-escpr2: 1.2.25 -> 1.2.26

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

diff --git a/pkgs/by-name/ep/epson-escpr2/package.nix b/pkgs/by-name/ep/epson-escpr2/package.nix
index 13bcd4818c8f..55e7f9974a55 100644
--- a/pkgs/by-name/ep/epson-escpr2/package.nix
+++ b/pkgs/by-name/ep/epson-escpr2/package.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation rec {
   pname = "epson-inkjet-printer-escpr2";
-  version = "1.2.25";
+  version = "1.2.26";
 
   src = fetchurl {
     # To find the most recent version go to
     # https://support.epson.net/linux/Printer/LSB_distribution_pages/en/escpr2.php
     # and retreive the download link for source package for x86 CPU
-    url = "https://download3.ebz.epson.net/dsc/f/03/00/16/60/34/8e2b40dc2a02ae67c82b2c55786159f07edf3f5a/epson-inkjet-printer-escpr2-1.2.25-1.src.rpm";
-    sha256 = "sha256-rhNv6Ak83KG5SmdVUyu/2UXTB0BTj4yDyKRO++9q8WY=";
+    url = "https://download3.ebz.epson.net/dsc/f/03/00/16/65/06/8fdecc271f6473178d08ffd6b6f6ca2abc92e32f/epson-inkjet-printer-escpr2-1.2.26-1.src.rpm";
+    sha256 = "sha256-Js2iZCS9ZzJVRF8PbDA/U1muOne+upq4sA0u+NVIk/0=";
   };
 
   unpackPhase = ''

From 26a4a7c2c741fa74fc30ee7dc404e3f02d9e3b9f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Jan 2025 21:15:15 +0000
Subject: [PATCH 40/76] netbird-ui: 0.35.2 -> 0.36.5

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

diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix
index a66390a16e3e..284d79489090 100644
--- a/pkgs/tools/networking/netbird/default.nix
+++ b/pkgs/tools/networking/netbird/default.nix
@@ -35,16 +35,16 @@ let
 in
 buildGoModule rec {
   pname = "netbird";
-  version = "0.35.2";
+  version = "0.36.5";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     tag = "v${version}";
-    hash = "sha256-CvKJiv3CyCRp0wyH+OZejOChcumnMOrA7o9wL4ElJio=";
+    hash = "sha256-3k41lydp6bIfANblvdYK07xY/B3SbXwipbLAIUxmf9I=";
   };
 
-  vendorHash = "sha256-CgfZZOiFDLf6vCbzovpwzt7FlO9BnzNSdR8e5U+xCDQ=";
+  vendorHash = "sha256-30KSccdeQ+DrYjotCR0w0LvY1jCBBJIAy5rKQtSsD9Q=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
 

From 45e7f2e2126470cb09df17742580910be9dec3c2 Mon Sep 17 00:00:00 2001
From: ToasterUwU <Aki@ToasterUwU.com>
Date: Wed, 29 Jan 2025 23:50:39 +0100
Subject: [PATCH 41/76] rqbit: 7.0.1 -> 8.0.0

---
 pkgs/by-name/rq/rqbit/package.nix | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/rq/rqbit/package.nix b/pkgs/by-name/rq/rqbit/package.nix
index f57afe0a066f..f5205818e20a 100644
--- a/pkgs/by-name/rq/rqbit/package.nix
+++ b/pkgs/by-name/rq/rqbit/package.nix
@@ -5,20 +5,20 @@
   fetchFromGitHub,
   pkg-config,
   openssl,
-  darwin,
   buildNpmPackage,
   nodejs_20,
+  nix-update-script,
 }:
 let
   pname = "rqbit";
 
-  version = "7.0.1";
+  version = "8.0.0";
 
   src = fetchFromGitHub {
     owner = "ikatson";
     repo = "rqbit";
     rev = "v${version}";
-    hash = "sha256-Lt3HxK8fB1Xn2422wGkJ90muJjZ7r9ZHngGD/2tkaMM=";
+    hash = "sha256-Meztr/UxLgnbd3YwkSW0vy+D2N4mFg2v+T4nBnYiQBI=";
   };
 
   rqbit-webui = buildNpmPackage {
@@ -30,7 +30,7 @@ let
 
     sourceRoot = "${src.name}/crates/librqbit/webui";
 
-    npmDepsHash = "sha256-VYPZXZx9rKLKZm5+d2wSVkoPLCQCffaeZVSi7mKRH/M=";
+    npmDepsHash = "sha256-vib8jpf7Jn1qv0m/dWJ4TbisByczNbtEd8hIM5ll2Q8=";
 
     installPhase = ''
       runHook preInstall
@@ -45,15 +45,12 @@ in
 rustPlatform.buildRustPackage {
   inherit pname version src;
 
-  cargoHash = "sha256-esDUzzVm5J8fKftBfk5StJzN1YzLa1p0t7BsoxzrowI=";
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-FGcws80cX0I74bVaSV6OLntPFPNanGAFm6CVHDAGbOU=";
 
-  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
-    pkg-config
-  ];
+  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
 
-  buildInputs =
-    lib.optionals stdenv.hostPlatform.isLinux [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
 
   preConfigure = ''
     mkdir -p crates/librqbit/webui/dist
@@ -70,6 +67,13 @@ rustPlatform.buildRustPackage {
 
   passthru.webui = rqbit-webui;
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--subpackage"
+      "webui"
+    ];
+  };
+
   meta = with lib; {
     description = "Bittorrent client in Rust";
     homepage = "https://github.com/ikatson/rqbit";

From 005c6846d9a0ced74cf5578db34c7bb10f507a5e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Jan 2025 22:53:34 +0000
Subject: [PATCH 42/76] python312Packages.fastecdsa: 3.0.0 -> 3.0.1

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

diff --git a/pkgs/development/python-modules/fastecdsa/default.nix b/pkgs/development/python-modules/fastecdsa/default.nix
index 71d0fb1f9f4e..58f80c336ab3 100644
--- a/pkgs/development/python-modules/fastecdsa/default.nix
+++ b/pkgs/development/python-modules/fastecdsa/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "fastecdsa";
-  version = "3.0.0";
+  version = "3.0.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-deOnwZYvjtOMps90fp7OUfzbMxDFsk0Oj72gFoMymAU=";
+    hash = "sha256-9LSlD9XjRsSUmro2XAYcP2sl7ueYPJc+HTHednK6SOo=";
   };
 
   buildInputs = [ gmp ];

From 33c6cafdddac70d5fd7d18f05794da983dc9b1e6 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Sun, 19 Jan 2025 15:05:52 -0500
Subject: [PATCH 43/76] ssh-python: init at 1.1.1

---
 .../python-modules/ssh-python/default.nix     | 46 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/python-modules/ssh-python/default.nix

diff --git a/pkgs/development/python-modules/ssh-python/default.nix b/pkgs/development/python-modules/ssh-python/default.nix
new file mode 100644
index 000000000000..eac4194a0871
--- /dev/null
+++ b/pkgs/development/python-modules/ssh-python/default.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  cython,
+  openssl,
+  zlib,
+  libssh,
+}:
+
+buildPythonPackage rec {
+  pname = "ssh-python";
+  version = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner = "ParallelSSH";
+    repo = "ssh-python";
+    tag = version;
+    hash = "sha256-kidz4uHT5C8TUROLGQUHihemYtwOoWZQNw7ElbwYKLM=";
+  };
+
+  build-system = [ setuptools ];
+  nativeBuildInputs = [
+    cython
+  ];
+  buildInputs = [
+    openssl
+    zlib
+    libssh
+  ];
+
+  env = {
+    SYSTEM_LIBSSH = true;
+  };
+
+  pythonImportsCheck = [ "ssh" ];
+
+  meta = {
+    description = "Python bindings for libssh C library";
+    homepage = "https://github.com/ParallelSSH/ssh-python";
+    changelog = "https://github.com/ParallelSSH/ssh-python/blob/${version}/Changelog.rst";
+    license = lib.licenses.lgpl21Only;
+    maintainers = with lib.maintainers; [ infinidoge ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5a8874b6eeb7..da9379202e22 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15516,6 +15516,8 @@ self: super: with self; {
 
   sshtunnel = callPackage ../development/python-modules/sshtunnel { };
 
+  ssh-python = callPackage ../development/python-modules/ssh-python { };
+
   sslib = callPackage ../development/python-modules/sslib { };
 
   ssg = callPackage ../development/python-modules/ssg { };

From 7d478f58b21bf2152f555075f3d77c95150b8470 Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Sun, 19 Jan 2025 15:06:02 -0500
Subject: [PATCH 44/76] ssh2-python: init at 1.1.2

---
 .../python-modules/ssh2-python/default.nix    | 46 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/python-modules/ssh2-python/default.nix

diff --git a/pkgs/development/python-modules/ssh2-python/default.nix b/pkgs/development/python-modules/ssh2-python/default.nix
new file mode 100644
index 000000000000..275e0250810e
--- /dev/null
+++ b/pkgs/development/python-modules/ssh2-python/default.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  cython,
+  openssl,
+  zlib,
+  libssh2,
+}:
+
+buildPythonPackage rec {
+  pname = "ssh2-python";
+  version = "1.1.2";
+
+  src = fetchFromGitHub {
+    owner = "ParallelSSH";
+    repo = "ssh2-python";
+    tag = version;
+    hash = "sha256-nNMe7BTHI4O9Ueyq2YxtHat4BrrtiWGFkKHwUu/NtkM=";
+  };
+
+  build-system = [ setuptools ];
+  nativeBuildInputs = [
+    cython
+  ];
+  buildInputs = [
+    openssl
+    zlib
+    libssh2
+  ];
+
+  env = {
+    SYSTEM_LIBSSH2 = true;
+  };
+
+  pythonImportsCheck = [ "ssh2" ];
+
+  meta = {
+    description = "Python bindings for libssh2 C library";
+    homepage = "https://github.com/ParallelSSH/ssh2-python";
+    changelog = "https://github.com/ParallelSSH/ssh2-python/blob/${version}/Changelog.rst";
+    license = lib.licenses.lgpl21Only;
+    maintainers = with lib.maintainers; [ infinidoge ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index da9379202e22..3effa07a7a18 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15518,6 +15518,8 @@ self: super: with self; {
 
   ssh-python = callPackage ../development/python-modules/ssh-python { };
 
+  ssh2-python = callPackage ../development/python-modules/ssh2-python { };
+
   sslib = callPackage ../development/python-modules/sslib { };
 
   ssg = callPackage ../development/python-modules/ssg { };

From 3c325aadc78407cb5b00d346914b925c2efa5ebd Mon Sep 17 00:00:00 2001
From: Infinidoge <infinidoge@inx.moe>
Date: Sun, 19 Jan 2025 15:06:16 -0500
Subject: [PATCH 45/76] parallel-ssh: init at 2.13.0

---
 .../python-modules/parallel-ssh/default.nix   | 46 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/python-modules/parallel-ssh/default.nix

diff --git a/pkgs/development/python-modules/parallel-ssh/default.nix b/pkgs/development/python-modules/parallel-ssh/default.nix
new file mode 100644
index 000000000000..107d5548d9cf
--- /dev/null
+++ b/pkgs/development/python-modules/parallel-ssh/default.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  gevent,
+  ssh-python,
+  ssh2-python,
+  unittestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "parallel-ssh";
+  version = "2.13.0";
+
+  src = fetchFromGitHub {
+    owner = "ParallelSSH";
+    repo = "parallel-ssh";
+    tag = version;
+    hash = "sha256-J/rwlJ9BOcENngIVz5cU+uA34hEEw7QsgsPnpNbbZbk=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    gevent
+    ssh-python
+    ssh2-python
+  ];
+
+  pythonImportsCheck = [ "pssh" ];
+
+  nativeCheckInputs = [
+    unittestCheckHook
+  ];
+
+  meta = {
+    description = "Asynchronous parallel SSH client library";
+    homepage = "https://github.com/ParallelSSH/parallel-ssh";
+    changelog = "https://github.com/ParallelSSH/parallel-ssh/blob/${version}/Changelog.rst";
+    license = lib.licenses.lgpl21Only;
+    maintainers = with lib.maintainers; [ infinidoge ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3effa07a7a18..8617a3a48c12 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10020,6 +10020,8 @@ self: super: with self; {
 
   paragraphs = callPackage ../development/python-modules/paragraphs { };
 
+  parallel-ssh = callPackage ../development/python-modules/parallel-ssh { };
+
   param = callPackage ../development/python-modules/param { };
 
   parameter-expansion-patched = callPackage ../development/python-modules/parameter-expansion-patched { };

From 783dd575e799fc6528a5dbb49dde0f75fd55e550 Mon Sep 17 00:00:00 2001
From: dzmitry-lahoda <dzmitry@lahoda.pro>
Date: Thu, 30 Jan 2025 01:51:27 +0000
Subject: [PATCH 46/76] maintainers: add dzmitry-lahoda

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0072f5ab6826..d8f7e361c8eb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6421,6 +6421,12 @@
     githubId = 15128988;
     name = "Maksim Dzabraev";
   };
+  dzmitry-lahoda = {
+    email = "dzmitry@lahoda.pro";
+    github = "dzmitry-lahoda";
+    githubId = 757125;
+    name = "Dzmitry Lahoda";
+  };
   e1mo = {
     email = "nixpkgs@e1mo.de";
     matrix = "@e1mo:chaos.jetzt";

From 75406e4e99f1a1c5f4d809370f4a48b92b1ada54 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Jan 2025 01:57:14 +0000
Subject: [PATCH 47/76] sane-airscan: 0.99.31 -> 0.99.32

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

diff --git a/pkgs/by-name/sa/sane-airscan/package.nix b/pkgs/by-name/sa/sane-airscan/package.nix
index f7c0ed3ea8ac..ee4fb89cec9c 100644
--- a/pkgs/by-name/sa/sane-airscan/package.nix
+++ b/pkgs/by-name/sa/sane-airscan/package.nix
@@ -15,7 +15,7 @@
 }:
 stdenv.mkDerivation rec {
   pname = "sane-airscan";
-  version = "0.99.31";
+  version = "0.99.32";
 
   nativeBuildInputs = [
     meson
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     owner = "alexpevzner";
     repo = pname;
     rev = version;
-    sha256 = "sha256-ZSmublTne8YZM8irowPedgEr2fzPzwt1QGWU+BBTAzA=";
+    sha256 = "sha256-lfWdeXURWLwae9G11oIS25CsOkzTjigRDGFzdV33bTU=";
   };
 
   meta = with lib; {

From 610dadfba8b42d8335d5b103e0a3325a4d53d270 Mon Sep 17 00:00:00 2001
From: dzmitry-lahoda <dzmitry@lahoda.pro>
Date: Thu, 30 Jan 2025 01:52:36 +0000
Subject: [PATCH 48/76] lsh: init at 1.3.3

---
 pkgs/by-name/ls/lsh/package.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/aliases.nix      |  1 -
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/ls/lsh/package.nix

diff --git a/pkgs/by-name/ls/lsh/package.nix b/pkgs/by-name/ls/lsh/package.nix
new file mode 100644
index 000000000000..bfa38767ab47
--- /dev/null
+++ b/pkgs/by-name/ls/lsh/package.nix
@@ -0,0 +1,24 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+buildGoModule rec {
+  pname = "lsh";
+  version = "1.3.3";
+  src = fetchFromGitHub {
+    owner = "latitudesh";
+    repo = "lsh";
+    rev = "v${version}";
+    sha256 = "0YpjG4u+wb4LRWzfTddKFwut0MBzEch+HZijmZiVXpE=";
+  };
+  vendorHash = "sha256-ogdyzfayleka4Y8x74ZtttD7MaeCl1qP/rQi9x0tMto=";
+  subPackages = [ "." ];
+  meta = with lib; {
+    changelog = "https://github.com/latitudesh/lsh/releases/tag/v${version}";
+    description = "Command-Line Interface for Latitude.sh";
+    homepage = "https://github.com/latitudesh/lsh";
+    license = licenses.mit;
+    maintainers = [ lib.maintainers.dzmitry-lahoda ];
+  };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2775290c81ae..b70bfc0232ac 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -830,7 +830,6 @@ mapAliases {
   lobster-two = throw "'lobster-two' has been renamed to/replaced by 'google-fonts'"; # Converted to throw 2024-10-17
   loc = throw "'loc' has been removed due to lack of upstream maintenance. Consider 'tokei' as an alternative."; # Added 2025-01-25
   loop = throw "'loop' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  lsh = throw "lsh has been removed as it had no maintainer in Nixpkgs and hasn't seen an upstream release in over a decade"; # Added 2024-08-14
   luna-icons = throw "luna-icons has been removed as it was removed upstream"; # Added 2024-10-29
   lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18
   lxd = lib.warnOnInstantiate "lxd has been renamed to lxd-lts" lxd-lts; # Added 2024-04-01

From fbc3a1036de8ba5e7c1d0e3bf2ca47379b555eb4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Jan 2025 03:19:13 +0000
Subject: [PATCH 49/76] yamlscript: 0.1.88 -> 0.1.89

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

diff --git a/pkgs/by-name/ya/yamlscript/package.nix b/pkgs/by-name/ya/yamlscript/package.nix
index 2575060ee131..189caee6282c 100644
--- a/pkgs/by-name/ya/yamlscript/package.nix
+++ b/pkgs/by-name/ya/yamlscript/package.nix
@@ -2,11 +2,11 @@
 
 buildGraalvmNativeImage rec {
   pname = "yamlscript";
-  version = "0.1.88";
+  version = "0.1.89";
 
   src = fetchurl {
     url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar";
-    hash = "sha256-yG6KcMyCq8HTJk+nY+zkHOrzsNbiUDW+9ms5ZA0pmz8=";
+    hash = "sha256-SSgiAjPRow4R1cLl7POUzC+TeQ4Oq+8QeFh410IsgdA=";
   };
 
   executable = "ys";

From 10f92a83b3629aca6fe8eb549132239fddfe47e7 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Wed, 29 Jan 2025 14:08:02 -0500
Subject: [PATCH 50/76] texlab: 5.22.0 -> 5.22.1

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

diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix
index 0e1b70d28b40..3e236dd0d018 100644
--- a/pkgs/development/tools/misc/texlab/default.nix
+++ b/pkgs/development/tools/misc/texlab/default.nix
@@ -16,16 +16,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "texlab";
-  version = "5.22.0";
+  version = "5.22.1";
 
   src = fetchFromGitHub {
     owner = "latex-lsp";
     repo = "texlab";
     tag = "v${version}";
-    hash = "sha256-3yMfacncGTqm07OmbNdj2gmkHnagN3urQFb7lCSxegg=";
+    hash = "sha256-ldbWENQa7ZiBSx1b1JgChIgadqzHEPvUyOdHVgW6MSU=";
   };
 
-  cargoHash = "sha256-LLRZ0UdExttpOMFwiTQ7IHrpmXYE2mvXvE0LfQ8/4KA=";
+  cargoHash = "sha256-HMTo0RSjiNpB9V/9LS2jm/JJGsO2hpJ4kSl70+fjWH0=";
 
   outputs = [ "out" ] ++ lib.optional (!isCross) "man";
 

From 121bb767a8c156567166147a3e3ce49d6b93f14d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Jan 2025 06:53:56 +0000
Subject: [PATCH 51/76] crowdin-cli: 4.5.1 -> 4.5.2

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

diff --git a/pkgs/by-name/cr/crowdin-cli/package.nix b/pkgs/by-name/cr/crowdin-cli/package.nix
index d53f28993c5d..6cdea35be0bf 100644
--- a/pkgs/by-name/cr/crowdin-cli/package.nix
+++ b/pkgs/by-name/cr/crowdin-cli/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "crowdin-cli";
-  version = "4.5.1";
+  version = "4.5.2";
 
   src = fetchurl {
     url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip";
-    hash = "sha256-wmW6RBVMdpcawCEgLaZwOLStdUIWumsgc39Y0Kv8uEE=";
+    hash = "sha256-gg9cBN0N4KGHW6i56uO5+UE1YJFMa2aQ8nJV8JPSvmU=";
   };
 
   nativeBuildInputs = [

From a8aadfbb33be643011946e050225d8e86c27f5cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Jan 2025 06:57:55 +0000
Subject: [PATCH 52/76] containerlab: 0.62.0 -> 0.62.2

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

diff --git a/pkgs/by-name/co/containerlab/package.nix b/pkgs/by-name/co/containerlab/package.nix
index 9f1912c3dce9..4811830f1fa4 100644
--- a/pkgs/by-name/co/containerlab/package.nix
+++ b/pkgs/by-name/co/containerlab/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "containerlab";
-  version = "0.62.0";
+  version = "0.62.2";
 
   src = fetchFromGitHub {
     owner = "srl-labs";
     repo = "containerlab";
     rev = "v${version}";
-    hash = "sha256-6WDmjVRLvh8FBydaN41Vj4B5BIkIF9VnvhRcJR3k9Ec=";
+    hash = "sha256-RUe/IHHhZKbxtNVxiS29/OPvpCCOzaz2d5Qh3vVll3U=";
   };
 
   vendorHash = "sha256-G9W4iC04R5Rvl3hAJtMlUKJKo7AAIE33Y2c+0HedXU8=";

From b88cc0466ce6f813ba960f5d54aecf1c492d3d6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christina=20S=C3=B8rensen?= <ces@fem.gg>
Date: Thu, 30 Jan 2025 09:21:38 +0100
Subject: [PATCH 53/76] eza: 0.20.18 -> 0.20.19

changelog: https://github.com/eza-community/eza/releases/tag/v0.20.19
---
 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 23c2ab56f271..ce97a5b96391 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.18";
+  version = "0.20.19";
 
   src = fetchFromGitHub {
     owner = "eza-community";
     repo = "eza";
     rev = "v${version}";
-    hash = "sha256-XJ8RYfBduTK5CkvFjVRF6yGkgBdojuewFUrEvRcTJsA=";
+    hash = "sha256-Fgb2+tKDTL7KxJhRavNc5K8AG98eZFOmDOc+sVY7rdk=";
   };
 
-  cargoHash = "sha256-FUd2dtSwZEBJDCs5EbgrtHfO2oquZP/4wxhVreCaayg=";
+  cargoHash = "sha256-+scWqtriW9qh6nqiPV3LNLC333JRw5WZI04BHIZlqE4=";
 
   nativeBuildInputs = [
     cmake

From ea2225cd690eb2cba329d74ac1521a83549dc07a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 20 Jan 2025 09:08:25 +0100
Subject: [PATCH 54/76] ocamlPackages.mem_usage: init at 0.1.2

---
 .../ocaml-modules/mem_usage/default.nix       | 28 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/mem_usage/default.nix

diff --git a/pkgs/development/ocaml-modules/mem_usage/default.nix b/pkgs/development/ocaml-modules/mem_usage/default.nix
new file mode 100644
index 000000000000..613edfe0377f
--- /dev/null
+++ b/pkgs/development/ocaml-modules/mem_usage/default.nix
@@ -0,0 +1,28 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildDunePackage,
+}:
+
+buildDunePackage rec {
+  pname = "mem_usage";
+  version = "0.1.2";
+
+  src = fetchFromGitHub {
+    owner = "savonet";
+    repo = "ocaml-mem_usage";
+    rev = "v${version}";
+    hash = "sha256-5tQNsqbiU9oJvKHUjeTo/ST4A0Axc95gdJISLaa9VRM=";
+  };
+
+  minimalOCamlVersion = "4.07";
+
+  doCheck = true;
+
+  meta = {
+    license = lib.licenses.mit;
+    homepage = "https://www.liquidsoap.info/ocaml-mem_usage/";
+    description = "Cross-platform memory usage information";
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index d8649636dbb2..4c0fd36e7923 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1087,6 +1087,8 @@ let
 
     memtrace = callPackage ../development/ocaml-modules/memtrace { };
 
+    mem_usage = callPackage ../development/ocaml-modules/mem_usage { };
+
     menhir = callPackage ../development/ocaml-modules/menhir { };
 
     menhirLib = callPackage ../development/ocaml-modules/menhir/lib.nix { };

From bb136ef6dc4aabfb5e222181350526ab4a0574ce Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Fri, 17 Jan 2025 23:29:34 +0900
Subject: [PATCH 55/76] =?UTF-8?q?liquidsoap:=202.2.5=20=E2=86=92=202.3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ocamlPackages.ffmpeg: 1.1.11 -> 1.2.1
Changelog: https://github.com/savonet/ocaml-ffmpeg/releases/tag/v1.2.1
Diff: https://github.com/savonet/ocaml-ffmpeg/compare/v1.1.11...v1.2.1
---
 .../development/ocaml-modules/ffmpeg/base.nix |  4 ++--
 pkgs/tools/audio/liquidsoap/full.nix          | 19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ffmpeg/base.nix b/pkgs/development/ocaml-modules/ffmpeg/base.nix
index bf63c00378cc..f44069429bd4 100644
--- a/pkgs/development/ocaml-modules/ffmpeg/base.nix
+++ b/pkgs/development/ocaml-modules/ffmpeg/base.nix
@@ -1,13 +1,13 @@
 { lib, fetchFromGitHub }:
 
 rec {
-  version = "1.1.11";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "savonet";
     repo = "ocaml-ffmpeg";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-Tr0YhoaaUSOlA7vlhAjPyFJI/iL7Z54oO27RnG7d+nA=";
+    sha256 = "sha256-Df+dU7Cd1rgsC/TelPzQ7wYlwsX9MGd8qcYsVN6dyMg=";
   };
 
   meta = with lib; {
diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix
index 0d526b2ce6aa..5e9acac36a6f 100644
--- a/pkgs/tools/audio/liquidsoap/full.nix
+++ b/pkgs/tools/audio/liquidsoap/full.nix
@@ -3,6 +3,7 @@
   stdenv,
   makeWrapper,
   fetchFromGitHub,
+  fetchpatch,
   which,
   pkg-config,
   libjpeg,
@@ -23,7 +24,7 @@
 
 let
   pname = "liquidsoap";
-  version = "2.2.5";
+  version = "2.3.0";
 in
 stdenv.mkDerivation {
   inherit pname version;
@@ -32,9 +33,18 @@ stdenv.mkDerivation {
     owner = "savonet";
     repo = "liquidsoap";
     rev = "refs/tags/v${version}";
-    hash = "sha256-o3P7oTizO2l2WkB4LormZ/Ses5jZOpgQ1r1zB1Y3Bjs=";
+    hash = "sha256-wNOENkIQw8LWfceI24aa8Ja3ZkePgTIGdIpGgqs/3Ss=";
   };
 
+  patches = [
+    # Compatibility with saturn_lockfree 0.5.0
+    (fetchpatch {
+      url = "https://github.com/savonet/liquidsoap/commit/3d6d2d9cd1c7750f2e97449516235a692b28bf56.patch";
+      includes = [ "src/*" ];
+      hash = "sha256-pmC3gwmkv+Hat61aulNkTKS4xMz+4D94OCMtzhzNfT4=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace src/lang/dune \
       --replace-warn "(run git rev-parse --short HEAD)" "(run echo -n nixpkgs)"
@@ -88,7 +98,7 @@ stdenv.mkDerivation {
     ocamlPackages.duppy
     ocamlPackages.mm
     ocamlPackages.ocurl
-    ocamlPackages.ocaml_pcre
+    ocamlPackages.re
     ocamlPackages.cry
     ocamlPackages.camomile
     ocamlPackages.uri
@@ -96,10 +106,13 @@ stdenv.mkDerivation {
     ocamlPackages.magic-mime
     ocamlPackages.menhir # liquidsoap-lang
     ocamlPackages.menhirLib
+    ocamlPackages.mem_usage
     ocamlPackages.metadata
     ocamlPackages.dune-build-info
     ocamlPackages.re
+    ocamlPackages.saturn_lockfree # liquidsoap-lang
     ocamlPackages.sedlex # liquidsoap-lang
+    ocamlPackages.ppx_hash # liquidsoap-lang
     ocamlPackages.ppx_string
 
     # Recommended dependencies

From 73932a6b801f3bc36c6dbd32b89881115d8fc995 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Jan 2025 08:36:59 +0000
Subject: [PATCH 56/76] trealla: 2.63.15 -> 2.63.33

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

diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix
index 62cb6e0abd74..e8a4c1e51c4a 100644
--- a/pkgs/by-name/tr/trealla/package.nix
+++ b/pkgs/by-name/tr/trealla/package.nix
@@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [
 ];
 stdenv.mkDerivation (finalAttrs: {
   pname = "trealla";
-  version = "2.63.15";
+  version = "2.63.33";
 
   src = fetchFromGitHub {
     owner = "trealla-prolog";
     repo = "trealla";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-4YQCfkAJTTS0n0hDUcc25ks0XtToqNL7eFVM1aPjE/w=";
+    hash = "sha256-ivbjnYKuZW3xvyPxOF3Ov/0obI71lri/itsVFJ4Cb4k=";
   };
 
   postPatch = ''

From 82fb28b36d514f1424c58c709b5ee57f9dead56f Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Thu, 30 Jan 2025 10:06:22 +0100
Subject: [PATCH 57/76] ungoogled-chromium: 132.0.6834.110-1 ->
 132.0.6834.159-1

https://chromereleases.googleblog.com/2025/01/stable-channel-update-for-desktop_28.html

This update includes 2 security fixes.

CVEs:
CVE-2025-0762
---
 .../networking/browsers/chromium/info.json         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index ea865112f2d0..0ef9d8572282 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -766,7 +766,7 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "132.0.6834.110",
+    "version": "132.0.6834.159",
     "deps": {
       "depot_tools": {
         "rev": "41d43a2a2290450aeab946883542f8049b155c87",
@@ -777,16 +777,16 @@
         "hash": "sha256-zZoD5Bx7wIEP2KJkHef6wHrxU3px+8Vseq29QcK32bg="
       },
       "ungoogled-patches": {
-        "rev": "132.0.6834.110-1",
-        "hash": "sha256-pFuRsGnOXAECat5B0fUi9aw8Wdqbu1EBwyHNCBMoOpw="
+        "rev": "132.0.6834.159-1",
+        "hash": "sha256-sot7YixPnt8ALPR2IIPgR1NtN/Oc14qlzyB3Vny+DAM="
       },
       "npmHash": "sha256-H1/h3x+Cgp1x94Ze3UPPHxRVpylZDvpMXMOuS+jk2dw="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "df453a35f099772fdb954e33551388add2ca3cde",
-        "hash": "sha256-deLCukHvNv6mUp33hHHFgeKD45SQs517xoRfCfReLAA=",
+        "rev": "2d77d3fc4452661469b78f115e0aed4d71269739",
+        "hash": "sha256-LbLIxN13fx6zzU5xzGvkTpw7tKRQBel2PYhflHLbWE8=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -1526,8 +1526,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "625e932f21c984db3f9fba8b56b9afa4e977994c",
-        "hash": "sha256-19uEppABiuh+zHjgwAj/BPee/ClB/FKfzHxLKrdNhOE="
+        "rev": "210ec27ca748c70580fe374f9811761667312b41",
+        "hash": "sha256-pfkztEU22T15H2amf+b5bpALQ6Er1YAxZoxbbfb2YU8="
       }
     }
   }

From b55dd979b8df7c5428c398973ebbbbf7b01a07d1 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 28 Jan 2025 11:23:53 +0100
Subject: [PATCH 58/76] fetchCrate: expose pname and version in passthru

---
 pkgs/build-support/rust/fetchcrate.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/rust/fetchcrate.nix b/pkgs/build-support/rust/fetchcrate.nix
index 63a629500253..b34f0336691b 100644
--- a/pkgs/build-support/rust/fetchcrate.nix
+++ b/pkgs/build-support/rust/fetchcrate.nix
@@ -21,6 +21,8 @@ assert pname == null || pname == crateName;
   {
     name = "${crateName}-${version}.tar.gz";
     url = "${registryDl}/${crateName}/${version}/download";
+
+    passthru = { inherit pname version; };
   }
   // lib.optionalAttrs unpack {
     extension = "tar.gz";

From bca1dde2b41b506f0af94aae289b7eedbfda3cab Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 28 Jan 2025 11:24:22 +0100
Subject: [PATCH 59/76] buildWasmBindgenCli,wasm-bindgen-cli-*: init

Exposing an overridable cargoHash parameter is problematic because it
will produce silently broken FODs if we change the hashing scheme,
which we are currently doing across the tree because Cargo 1.84.0 has
changed the output of fetchCargoTarball, meaning all hashes have been
invalidated.  To avoid this happening in future, we are changing to
the fetchCargoVendor mechanism, which does not depend on
implementation details of Cargo.

The future-proof way to override a package with Cargo dependencies is
to pass a cargoDeps object.  This is more verbose, and requires the
caller to have access to the src object for the package.  To
compensate for this, I've introduced a buildWasmBindgenCli function
that is nicer to use than wasm-bindgen-cli.overrideAttrs, and I've
also introduced versioned attributes for wasm-bindgen-cli versions
currently in use in Nixpkgs, so that each package that wants to use a
particular version doesn't have to duplicate the src and cargoDeps
definitions for that version.

The unversioned "wasm-bindgen-cli" attribute is demoted to an alias,
with a view to its eventual removal.
---
 pkgs/applications/misc/pagefind/default.nix   | 10 ++----
 .../wasm-bindgen-cli/default.nix}             | 12 ++++---
 pkgs/by-name/ll/lldap/package.nix             | 10 ++----
 pkgs/by-name/st/stalwart-mail/webadmin.nix    |  9 ++----
 pkgs/by-name/tp/tpsecore/package.nix          | 10 ++----
 .../wa/wasm-bindgen-cli_0_2_100/package.nix   | 19 ++++++++++++
 .../wa/wasm-bindgen-cli_0_2_92/package.nix    | 19 ++++++++++++
 .../wa/wasm-bindgen-cli_0_2_93/package.nix    | 19 ++++++++++++
 .../wa/wasm-bindgen-cli_0_2_95/package.nix    | 19 ++++++++++++
 pkgs/servers/teleport/15/default.nix          |  9 +-----
 pkgs/servers/teleport/16/default.nix          |  9 +-----
 pkgs/servers/teleport/default.nix             | 31 ++++++++++++++++---
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  3 ++
 14 files changed, 125 insertions(+), 55 deletions(-)
 rename pkgs/{by-name/wa/wasm-bindgen-cli/package.nix => build-support/wasm-bindgen-cli/default.nix} (78%)
 create mode 100644 pkgs/by-name/wa/wasm-bindgen-cli_0_2_100/package.nix
 create mode 100644 pkgs/by-name/wa/wasm-bindgen-cli_0_2_92/package.nix
 create mode 100644 pkgs/by-name/wa/wasm-bindgen-cli_0_2_93/package.nix
 create mode 100644 pkgs/by-name/wa/wasm-bindgen-cli_0_2_95/package.nix

diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix
index 84164c0b04f0..f0096de5ae09 100644
--- a/pkgs/applications/misc/pagefind/default.nix
+++ b/pkgs/applications/misc/pagefind/default.nix
@@ -12,7 +12,7 @@
   npmHooks,
   python3,
   rustc,
-  wasm-bindgen-cli,
+  wasm-bindgen-cli_0_2_92,
   wasm-pack,
 }:
 
@@ -20,12 +20,6 @@
 
 let
 
-  wasm-bindgen-92 = wasm-bindgen-cli.override {
-    version = "0.2.92";
-    hash = "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0=";
-    cargoHash = "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0=";
-  };
-
   # the lindera-unidic v0.32.2 crate uses [1] an outdated unidic-mecab fork [2] and builds it in pure rust
   # [1] https://github.com/lindera/lindera/blob/v0.32.2/lindera-unidic/build.rs#L5-L11
   # [2] https://github.com/lindera/unidic-mecab
@@ -121,7 +115,7 @@ rustPlatform.buildRustPackage rec {
       nodejs
       rustc
       rustc.llvmPackages.lld
-      wasm-bindgen-92
+      wasm-bindgen-cli_0_2_92
       wasm-pack
       httplz
     ]
diff --git a/pkgs/by-name/wa/wasm-bindgen-cli/package.nix b/pkgs/build-support/wasm-bindgen-cli/default.nix
similarity index 78%
rename from pkgs/by-name/wa/wasm-bindgen-cli/package.nix
rename to pkgs/build-support/wasm-bindgen-cli/default.nix
index 9fd1db1cdcde..4597009c387b 100644
--- a/pkgs/by-name/wa/wasm-bindgen-cli/package.nix
+++ b/pkgs/build-support/wasm-bindgen-cli/default.nix
@@ -9,16 +9,18 @@
   stdenv,
   curl,
   darwin,
-  version ? "0.2.100",
-  hash ? "sha256-3RJzK7mkYFrs7C/WkhW9Rr4LdP5ofb2FdYGz1P7Uxog=",
-  cargoHash ? "sha256-tD0OY2PounRqsRiFh8Js5nyknQ809ZcHMvCOLrvYHRE=",
+}:
+
+{
+  version ? src.version,
+  src,
+  cargoDeps,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "wasm-bindgen-cli";
-  inherit version hash cargoHash;
 
-  src = fetchCrate { inherit pname version hash; };
+  inherit version src cargoDeps;
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/ll/lldap/package.nix b/pkgs/by-name/ll/lldap/package.nix
index 17d6aa009cf0..e3092f19fbff 100644
--- a/pkgs/by-name/ll/lldap/package.nix
+++ b/pkgs/by-name/ll/lldap/package.nix
@@ -5,19 +5,13 @@
 , nixosTests
 , rustPlatform
 , rustc
-, wasm-bindgen-cli
+, wasm-bindgen-cli_0_2_95
 , wasm-pack
 , which
 }:
 
 let
 
-  wasm-bindgen-95 = wasm-bindgen-cli.override {
-    version = "0.2.95";
-    hash = "sha256-prMIreQeAcbJ8/g3+pMp1Wp9H5u+xLqxRxL+34hICss=";
-    cargoHash = "sha256-6iMebkD7FQvixlmghGGIvpdGwFNLfnUcFke/Rg8nPK4=";
-  };
-
   commonDerivationAttrs = rec {
     pname = "lldap";
     version = "0.6.1";
@@ -44,7 +38,7 @@ let
     pname = commonDerivationAttrs.pname + "-frontend";
 
     nativeBuildInputs = [
-      wasm-pack wasm-bindgen-95 binaryen which rustc rustc.llvmPackages.lld
+      wasm-pack wasm-bindgen-cli_0_2_95 binaryen which rustc rustc.llvmPackages.lld
     ];
 
     buildPhase = ''
diff --git a/pkgs/by-name/st/stalwart-mail/webadmin.nix b/pkgs/by-name/st/stalwart-mail/webadmin.nix
index 8776839677eb..8cf8b5418d44 100644
--- a/pkgs/by-name/st/stalwart-mail/webadmin.nix
+++ b/pkgs/by-name/st/stalwart-mail/webadmin.nix
@@ -9,7 +9,7 @@
   nodejs,
   npmHooks,
   llvmPackages,
-  wasm-bindgen-cli,
+  wasm-bindgen-cli_0_2_93,
   binaryen,
   zip,
 }:
@@ -46,11 +46,8 @@ rustPlatform.buildRustPackage rec {
     tailwindcss
     trunk
     # needs to match with wasm-bindgen version in upstreams Cargo.lock
-    (wasm-bindgen-cli.override {
-      version = "0.2.93";
-      hash = "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0=";
-      cargoHash = "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ=";
-    })
+    wasm-bindgen-cli_0_2_93
+
     zip
   ];
 
diff --git a/pkgs/by-name/tp/tpsecore/package.nix b/pkgs/by-name/tp/tpsecore/package.nix
index 6d87efd6ec36..e8e50ea26e6a 100644
--- a/pkgs/by-name/tp/tpsecore/package.nix
+++ b/pkgs/by-name/tp/tpsecore/package.nix
@@ -4,18 +4,12 @@
   rustPlatform,
   rustc,
   wasm-pack,
-  wasm-bindgen-cli,
+  wasm-bindgen-cli_0_2_95,
   binaryen,
 }:
 
 let
   version = "0.1.1";
-
-  wasm-bindgen-cli-95 = wasm-bindgen-cli.override {
-    version = "0.2.95";
-    hash = "sha256-prMIreQeAcbJ8/g3+pMp1Wp9H5u+xLqxRxL+34hICss=";
-    cargoHash = "sha256-6iMebkD7FQvixlmghGGIvpdGwFNLfnUcFke/Rg8nPK4=";
-  };
 in
 rustPlatform.buildRustPackage {
   pname = "tpsecore";
@@ -32,7 +26,7 @@ rustPlatform.buildRustPackage {
 
   nativeBuildInputs = [
     wasm-pack
-    wasm-bindgen-cli-95
+    wasm-bindgen-cli_0_2_95
     binaryen
     rustc.llvmPackages.lld
   ];
diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_100/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_100/package.nix
new file mode 100644
index 000000000000..cbcf8d30385e
--- /dev/null
+++ b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_100/package.nix
@@ -0,0 +1,19 @@
+{
+  buildWasmBindgenCli,
+  fetchCrate,
+  rustPlatform,
+}:
+
+buildWasmBindgenCli rec {
+  src = fetchCrate {
+    pname = "wasm-bindgen-cli";
+    version = "0.2.100";
+    hash = "sha256-3RJzK7mkYFrs7C/WkhW9Rr4LdP5ofb2FdYGz1P7Uxog=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src;
+    inherit (src) pname version;
+    hash = "sha256-tD0OY2PounRqsRiFh8Js5nyknQ809ZcHMvCOLrvYHRE=";
+  };
+}
diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_92/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_92/package.nix
new file mode 100644
index 000000000000..b99c6e6ac2ae
--- /dev/null
+++ b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_92/package.nix
@@ -0,0 +1,19 @@
+{
+  buildWasmBindgenCli,
+  fetchCrate,
+  rustPlatform,
+}:
+
+buildWasmBindgenCli rec {
+  src = fetchCrate {
+    pname = "wasm-bindgen-cli";
+    version = "0.2.92";
+    hash = "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src;
+    inherit (src) pname version;
+    hash = "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0=";
+  };
+}
diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_93/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_93/package.nix
new file mode 100644
index 000000000000..0ae402f94d0d
--- /dev/null
+++ b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_93/package.nix
@@ -0,0 +1,19 @@
+{
+  buildWasmBindgenCli,
+  fetchCrate,
+  rustPlatform,
+}:
+
+buildWasmBindgenCli rec {
+  src = fetchCrate {
+    pname = "wasm-bindgen-cli";
+    version = "0.2.93";
+    hash = "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src;
+    inherit (src) pname version;
+    hash = "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ=";
+  };
+}
diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_95/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_95/package.nix
new file mode 100644
index 000000000000..1061677a6955
--- /dev/null
+++ b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_95/package.nix
@@ -0,0 +1,19 @@
+{
+  buildWasmBindgenCli,
+  fetchCrate,
+  rustPlatform,
+}:
+
+buildWasmBindgenCli rec {
+  src = fetchCrate {
+    pname = "wasm-bindgen-cli";
+    version = "0.2.95";
+    hash = "sha256-prMIreQeAcbJ8/g3+pMp1Wp9H5u+xLqxRxL+34hICss=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src;
+    inherit (src) pname version;
+    hash = "sha256-6iMebkD7FQvixlmghGGIvpdGwFNLfnUcFke/Rg8nPK4=";
+  };
+}
diff --git a/pkgs/servers/teleport/15/default.nix b/pkgs/servers/teleport/15/default.nix
index 7df86df8c40d..7062e418a628 100644
--- a/pkgs/servers/teleport/15/default.nix
+++ b/pkgs/servers/teleport/15/default.nix
@@ -1,4 +1,4 @@
-{ wasm-bindgen-cli, ... }@args:
+args:
 import ../generic.nix (
   args
   // {
@@ -14,12 +14,5 @@ import ../generic.nix (
         "sspi-0.10.1" = "sha256-fkclC/plTh2d8zcmqthYmr5yXqbPTeFxI1VuaPX5vxk=";
       };
     };
-
-    # wasm-bindgen-cli version must match the version of wasm-bindgen in Cargo.lock
-    wasm-bindgen-cli = wasm-bindgen-cli.override {
-      version = "0.2.92";
-      hash = "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0=";
-      cargoHash = "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0=";
-    };
   }
 )
diff --git a/pkgs/servers/teleport/16/default.nix b/pkgs/servers/teleport/16/default.nix
index 5ef66c9ce8a3..b13d17699943 100644
--- a/pkgs/servers/teleport/16/default.nix
+++ b/pkgs/servers/teleport/16/default.nix
@@ -1,4 +1,4 @@
-{ wasm-bindgen-cli, ... }@args:
+args:
 import ../generic.nix (
   args
   // {
@@ -13,12 +13,5 @@ import ../generic.nix (
         "ironrdp-async-0.1.0" = "sha256-DOwDHavDaEda+JK9M6kbvseoXe2LxJg3MLTY/Nu+PN0=";
       };
     };
-
-    # wasm-bindgen-cli version must match the version of wasm-bindgen in Cargo.lock
-    wasm-bindgen-cli = wasm-bindgen-cli.override {
-      version = "0.2.93";
-      hash = "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0=";
-      cargoHash = "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ=";
-    };
   }
 )
diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix
index eb8f6fb4492e..83c984455883 100644
--- a/pkgs/servers/teleport/default.nix
+++ b/pkgs/servers/teleport/default.nix
@@ -1,11 +1,34 @@
-{ callPackages, lib, ... }@args:
+{
+  callPackages,
+  lib,
+  wasm-bindgen-cli_0_2_92,
+  wasm-bindgen-cli_0_2_93,
+  ...
+}@args:
 let
   f = args: rec {
-    teleport_15 = import ./15 args;
-    teleport_16 = import ./16 args;
+    # wasm-bindgen-cli version must match the version of wasm-bindgen in Cargo.lock
+    teleport_15 = import ./15 (
+      args
+      // {
+        wasm-bindgen-cli = wasm-bindgen-cli_0_2_92;
+      }
+    );
+    teleport_16 = import ./16 (
+      args
+      // {
+        wasm-bindgen-cli = wasm-bindgen-cli_0_2_93;
+      }
+    );
     teleport = teleport_16;
   };
   # Ensure the following callPackages invocation includes everything 'generic' needs.
   f' = lib.setFunctionArgs f (builtins.functionArgs (import ./generic.nix));
 in
-callPackages f' (builtins.removeAttrs args [ "callPackages" ])
+callPackages f' (
+  builtins.removeAttrs args [
+    "callPackages"
+    "wasm-bindgen-cli_0_2_92"
+    "wasm-bindgen-cli_0_2_93"
+  ]
+)
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b70bfc0232ac..1160cc91d436 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1483,6 +1483,7 @@ mapAliases {
   wakatime = wakatime-cli; # 2024-05-30
   wal_e = throw "wal_e was removed as it is unmaintained upstream and depends on the removed boto package; upstream recommends using wal-g or pgbackrest"; # Added 2024-09-22
   wapp = tclPackages.wapp; # Added 2024-10-02
+  wasm-bindgen-cli = wasm-bindgen-cli_0_2_100;
   wayfireApplications-unwrapped = throw ''
     'wayfireApplications-unwrapped.wayfire' has been renamed to/replaced by 'wayfire'
     'wayfireApplications-unwrapped.wayfirePlugins' has been renamed to/replaced by 'wayfirePlugins'
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31dd0d695be4..7c3febb3ba13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5339,6 +5339,9 @@ with pkgs;
 
   webassemblyjs-cli = nodePackages."@webassemblyjs/cli-1.11.1";
   webassemblyjs-repl = nodePackages."@webassemblyjs/repl-1.11.1";
+
+  buildWasmBindgenCli = callPackage ../build-support/wasm-bindgen-cli { };
+
   wasm-strip = nodePackages."@webassemblyjs/wasm-strip";
   wasm-text-gen = nodePackages."@webassemblyjs/wasm-text-gen-1.11.1";
   wast-refmt = nodePackages."@webassemblyjs/wast-refmt-1.11.1";

From e18b76d2e0084bac1c0f1a54785ced5a2d3ef3d4 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 28 Jan 2025 11:35:59 +0100
Subject: [PATCH 60/76] wasm-bindgen-cli_*: fetchCargoTarball ->
 fetchCargoVendor

Cargo 1.84.0 seems to have changed the output format of cargo vendor
again, once again invalidating fetchCargoTarball FOD hashes.  It's
time to fix this once and for all, switching across the board to
fetchCargoVendor, which is not dependent on cargo vendor's output
format.
---
 pkgs/by-name/wa/wasm-bindgen-cli_0_2_100/package.nix | 4 ++--
 pkgs/by-name/wa/wasm-bindgen-cli_0_2_92/package.nix  | 4 ++--
 pkgs/by-name/wa/wasm-bindgen-cli_0_2_93/package.nix  | 4 ++--
 pkgs/by-name/wa/wasm-bindgen-cli_0_2_95/package.nix  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_100/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_100/package.nix
index cbcf8d30385e..0def66ce256e 100644
--- a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_100/package.nix
+++ b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_100/package.nix
@@ -11,9 +11,9 @@ buildWasmBindgenCli rec {
     hash = "sha256-3RJzK7mkYFrs7C/WkhW9Rr4LdP5ofb2FdYGz1P7Uxog=";
   };
 
-  cargoDeps = rustPlatform.fetchCargoTarball {
+  cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
     inherit (src) pname version;
-    hash = "sha256-tD0OY2PounRqsRiFh8Js5nyknQ809ZcHMvCOLrvYHRE=";
+    hash = "sha256-qsO12332HSjWCVKtf1cUePWWb9IdYUmT+8OPj/XP2WE=";
   };
 }
diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_92/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_92/package.nix
index b99c6e6ac2ae..3d908a9501ff 100644
--- a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_92/package.nix
+++ b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_92/package.nix
@@ -11,9 +11,9 @@ buildWasmBindgenCli rec {
     hash = "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0=";
   };
 
-  cargoDeps = rustPlatform.fetchCargoTarball {
+  cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
     inherit (src) pname version;
-    hash = "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0=";
+    hash = "sha256-81vQkKubMWaX0M3KAwpYgMA1zUQuImFGvh5yTW+rIAs=";
   };
 }
diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_93/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_93/package.nix
index 0ae402f94d0d..a76e94595f73 100644
--- a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_93/package.nix
+++ b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_93/package.nix
@@ -11,9 +11,9 @@ buildWasmBindgenCli rec {
     hash = "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0=";
   };
 
-  cargoDeps = rustPlatform.fetchCargoTarball {
+  cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
     inherit (src) pname version;
-    hash = "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ=";
+    hash = "sha256-s8srI+lu+DgQ+5BbaEXC4Ja/BL+K22LIl5Gd1PwNZZk=";
   };
 }
diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_95/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_95/package.nix
index 1061677a6955..34c590a4a250 100644
--- a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_95/package.nix
+++ b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_95/package.nix
@@ -11,9 +11,9 @@ buildWasmBindgenCli rec {
     hash = "sha256-prMIreQeAcbJ8/g3+pMp1Wp9H5u+xLqxRxL+34hICss=";
   };
 
-  cargoDeps = rustPlatform.fetchCargoTarball {
+  cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
     inherit (src) pname version;
-    hash = "sha256-6iMebkD7FQvixlmghGGIvpdGwFNLfnUcFke/Rg8nPK4=";
+    hash = "sha256-+h87/onAdpG0Jmeuy0Wd2djLFOAyaE52cAfxDVVcgP8=";
   };
 }

From fe3a38492f3ff1c65bf57de5ff9a1f26b3528fea Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 26 Jan 2025 16:48:14 +0100
Subject: [PATCH 61/76] epick: update source commit and hash

No activity upstream for three years, so not much point asking
upstream about it.  Diff seems to be to things that we don't care
about:

diff --git 1/nix/store/rlnw9ja3fs6kk52gwxxl80m75m0091dm-source/.github/workflows/release.yml 2/nix/store/n2wa70xwa4varqwj7xzavbl88cba5yi6-source/.github/workflows/release.yml
index c08d9a4..af96564 100644
--- 1/nix/store/rlnw9ja3fs6kk52gwxxl80m75m0091dm-source/.github/workflows/release.yml
+++ 2/nix/store/n2wa70xwa4varqwj7xzavbl88cba5yi6-source/.github/workflows/release.yml
@@ -1,5 +1,3 @@
-#name: release
-
 on:
   push:
     branches:
@@ -40,7 +38,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        build: [linux, windows-msvc]
         include:
         - build: linux
           os: ubuntu-latest
@@ -56,14 +53,18 @@ jobs:
       - name: Set up Rust
         uses: hecrj/setup-rust-action@v1
       - uses: actions/checkout@v3
-      - name: Set version
+      - name: Set version Unix
+        run: echo "EPICK_VERSION=$GITHUB_REF_NAME" >> $GITHUB_ENV
         if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
-        run: echo "EPICK_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
-      - name: Set version
+      - name: Set archive name Unix
+        run: echo "EPICK_ARCHIVE=epick-${{ env.EPICK_VERSION }}-${{ matrix.target }}" >> $GITHUB_ENV
+        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
+      - name: Set version Windows
+        run: echo "EPICK_VERSION=$env:GITHUB_REF_NAME" >> $env:GITHUB_ENV
+        if: matrix.os == 'windows-latest'
+      - name: Set archive name Windows
+        run: echo "EPICK_ARCHIVE=epick-$env:EPICK_VERSION-${{ matrix.target }}" >> $env:GITHUB_ENV
         if: matrix.os == 'windows-latest'
-        run: echo "EPICK_VERSION=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
-      - name: Set archive name
-        run: echo "EPICK_ARCHIVE=epick-${{ env.EPICK_VERSION}}-${{ matrix.target}}" >> $GITHUB_ENV
       - name: Install dependencies
         if: matrix.os == 'ubuntu-latest'
         run: sudo apt-get install libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libssl-dev
@@ -125,11 +126,16 @@ jobs:
       - name: Install pkger
         if: matrix.os == 'ubuntu-latest'
         run: |
-          curl -LO https://github.com/vv9k/pkger/releases/download/0.8.0/pkger-0.8.0-0.amd64.deb
-          sudo dpkg -i pkger-0.8.0-0.amd64.deb
+          curl -LO https://github.com/vv9k/pkger/releases/download/0.10.0/pkger-0.10.0-0.amd64.deb
+          sudo dpkg -i pkger-0.10.0-0.amd64.deb
           /usr/bin/pkger init
           mkdir -p $HOME/.config/pkger/recipes/epick
           cp pkger.yml $HOME/.config/pkger/recipes/epick/recipe.yaml
+      - name: Copy prebuilt archive
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          cp ${{ env.EPICK_ARCHIVE }}.tar.gz $HOME/.config/pkger/recipes/epick/
+          tar zcvf $HOME/.config/pkger/recipes/epick/assets.tar.gz assets
       - name: Build RPM and DEB
         if: matrix.os == 'ubuntu-latest'
         run: /usr/bin/pkger build -s deb -s rpm -- epick
diff --git 1/nix/store/rlnw9ja3fs6kk52gwxxl80m75m0091dm-source/pkger.yml 2/nix/store/n2wa70xwa4varqwj7xzavbl88cba5yi6-source/pkger.yml
index 83d4d53..4fdf5e6 100644
--- 1/nix/store/rlnw9ja3fs6kk52gwxxl80m75m0091dm-source/pkger.yml
+++ 2/nix/store/n2wa70xwa4varqwj7xzavbl88cba5yi6-source/pkger.yml
@@ -5,23 +5,12 @@ metadata:
   version: 0.9.0
   description: Color picker for creating harmonic color palettes
   license: GPL-3.0
-  source: https://github.com/vv9k/$RECIPE/archive/refs/tags/$RECIPE_VERSION.tar.gz
-  build_depends:
-    pkger-deb: ['libxcb-render0-dev', 'libxcb-shape0-dev', 'libxcb-xfixes0-dev', 'libxkbcommon-dev']
-    pkger-rpm: ['libxcb-devel', 'libxkbcommon-devel', 'libxcb']
-    all:
-      - curl
-      - gcc
-      - pkg-config
-      - python3
-configure:
-  steps:
-    - cmd: curl -o /tmp/install_rust.sh https://sh.rustup.rs
-    - cmd: sh /tmp/install_rust.sh -y --default-toolchain stable
+  all_images: true
+  source:
+    - epick-0.9.0-x86_64-unknown-linux.tar.gz
+    - assets.tar.gz
 build:
-  working_dir: $PKGER_BLD_DIR/${RECIPE}-$RECIPE_VERSION
-  steps:
-    - cmd: $HOME/.cargo/bin/cargo build --release
+  steps: []
 install:
   steps:
     - cmd: >-
@@ -32,9 +21,9 @@ install:
           usr/share/icons/hicolor/48x48/apps \
           usr/share/icons/hicolor/scalable/apps \
           usr/share/applications
-    - cmd: install -m755 $PKGER_BLD_DIR/$RECIPE-$RECIPE_VERSION/target/release/$RECIPE usr/bin/
-    - cmd: install -m644 $PKGER_BLD_DIR/$RECIPE-$RECIPE_VERSION/LICENSE usr/share/licenses/$RECIPE/LICENSE
-    - cmd: install -m644 $PKGER_BLD_DIR/$RECIPE-$RECIPE_VERSION/README.md usr/share/doc/$RECIPE/README.md
-    - cmd: install -m644 $PKGER_BLD_DIR/$RECIPE-$RECIPE_VERSION/assets/icon.png usr/share/icons/hicolor/48x48/apps/$RECIPE.png
-    - cmd: install -m644 $PKGER_BLD_DIR/$RECIPE-$RECIPE_VERSION/assets/icon.svg usr/share/icons/hicolor/scalable/apps/$RECIPE.svg
-    - cmd: install -m644 $PKGER_BLD_DIR/$RECIPE-$RECIPE_VERSION/assets/$RECIPE.desktop usr/share/applications/$RECIPE.desktop
+    - cmd: install -m755 $PKGER_BLD_DIR/$RECIPE/$RECIPE usr/bin/
+    - cmd: install -m644 $PKGER_BLD_DIR/$RECIPE/LICENSE usr/share/licenses/$RECIPE/LICENSE
+    - cmd: install -m644 $PKGER_BLD_DIR/$RECIPE/README.md usr/share/doc/$RECIPE/README.md
+    - cmd: install -m644 $PKGER_BLD_DIR/assets/icon.png usr/share/icons/hicolor/48x48/apps/$RECIPE.png
+    - cmd: install -m644 $PKGER_BLD_DIR/assets/icon.svg usr/share/icons/hicolor/scalable/apps/$RECIPE.svg
+    - cmd: install -m644 $PKGER_BLD_DIR/assets/$RECIPE.desktop usr/share/applications/$RECIPE.desktop
---
 pkgs/applications/graphics/epick/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix
index a74e1c001813..03fc2c4fe9d0 100644
--- a/pkgs/applications/graphics/epick/default.nix
+++ b/pkgs/applications/graphics/epick/default.nix
@@ -19,8 +19,9 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "vv9k";
     repo = pname;
-    rev = version;
-    sha256 = "sha256-k0WQu1n1sAHVor58jr060vD5/2rDrt1k5zzJlrK9WrU=";
+    # Upstream has rewritten tags on multiple occasions.
+    rev = "14ee92e049780406fffdc1e4a83bf1433775663f";
+    sha256 = "sha256-gjqAQrGJ9KFdzn2a3fOgu0VJ9zrX5stsbzriOGJaD/4=";
   };
 
   cargoHash = "sha256-OQZPOiMTpoWabxHa3TJG8L3zq8WxMeFttw8xggSXsMA=";

From cbce12747fc08d73f7dd1101ec17f604ec3816d9 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Thu, 30 Jan 2025 10:22:14 +0100
Subject: [PATCH 62/76] hyprland: 0.47.0 -> 0.47.1

---
 pkgs/by-name/hy/hyprland/info.json   | 10 +++++-----
 pkgs/by-name/hy/hyprland/package.nix |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json
index e77644544c14..942daa22e053 100644
--- a/pkgs/by-name/hy/hyprland/info.json
+++ b/pkgs/by-name/hy/hyprland/info.json
@@ -1,7 +1,7 @@
 {
-  "branch": "main",
-  "commit_hash": "04ac46c54357278fc68f0a95d26347ea0db99496",
-  "commit_message": "version: bump to 0.47.0",
-  "date": "2025-01-27",
-  "tag": "v0.47.0"
+  "branch": "v0.47.1-b",
+  "commit_hash": "75dff7205f6d2bd437abfb4196f700abee92581a",
+  "commit_message": "version: bump to 0.47.1",
+  "date": "2025-01-29",
+  "tag": "v0.47.1"
 }
diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix
index 2b1c9475c2e5..96493d63a36f 100644
--- a/pkgs/by-name/hy/hyprland/package.nix
+++ b/pkgs/by-name/hy/hyprland/package.nix
@@ -86,14 +86,14 @@ assert assertMsg (!hidpiXWayland)
 
 customStdenv.mkDerivation (finalAttrs: {
   pname = "hyprland" + optionalString debug "-debug";
-  version = "0.47.0";
+  version = "0.47.1";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprland";
     fetchSubmodules = true;
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rxvLiGNRUSVYPFsKIsqEbhxpR0sbWmHoo3azZKQ9fTY=";
+    hash = "sha256-374Ul6LCnuDdZ7o1xl2lDxTfmwt46K6csf6eniqFRYA=";
   };
 
   postPatch = ''

From 8bd4f355e1c5683793949ad5a56ff6210b453d97 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Thu, 30 Jan 2025 10:22:35 +0100
Subject: [PATCH 63/76] aquamarine: 0.7.1 -> 0.7.2

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

diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix
index 7e1dfceea806..66197c162d8d 100644
--- a/pkgs/by-name/aq/aquamarine/package.nix
+++ b/pkgs/by-name/aq/aquamarine/package.nix
@@ -23,13 +23,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "aquamarine";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "aquamarine";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-NbJiiPFnmciji3JHpqF/L0SdMQXKXn+q3Q/D8RjF/ak=";
+    hash = "sha256-ldWD4ci3LcBIfUN41qlBO/oR5chcsRLejMbSW8eH628=";
   };
 
   nativeBuildInputs = [

From 1ebaeb4efa5b257fccbfe20870322188db8d69db Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 30 Jan 2025 10:35:32 +0100
Subject: [PATCH 64/76] mullvad: fix tests in darwin sandbox

---
 pkgs/applications/networking/mullvad/mullvad.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix
index 3b29d73675f8..6935218bcb04 100644
--- a/pkgs/applications/networking/mullvad/mullvad.nix
+++ b/pkgs/applications/networking/mullvad/mullvad.nix
@@ -101,6 +101,7 @@ rustPlatform.buildRustPackage rec {
         --set-default MULLVAD_RESOURCE_DIR "$out/share/mullvad"
     '';
 
+  __darwinAllowLocalNetworking = true;
   passthru = {
     inherit libwg;
     inherit openvpn-mullvad;

From e5ff76fa4937d8d67bdfc12aaac0a98e1884c0cc Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 30 Jan 2025 10:48:44 +0100
Subject: [PATCH 65/76] mullvad: improve

---
 .../networking/mullvad/mullvad.nix             | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix
index 6935218bcb04..9e6fe6ff56d9 100644
--- a/pkgs/applications/networking/mullvad/mullvad.nix
+++ b/pkgs/applications/networking/mullvad/mullvad.nix
@@ -16,6 +16,7 @@
 , shadowsocks-rust
 , installShellFiles
 , writeShellScriptBin
+, versionCheckHook,
 }:
 let
   # NOTE(cole-h): This is necessary because wireguard-go-rs executes go in its build.rs (whose goal
@@ -33,7 +34,7 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "mullvad";
     repo = "mullvadvpn-app";
-    rev = version;
+    tag = version;
     fetchSubmodules = true;
     hash = "sha256-5GcYiyvulsOFepguBcBec98juw22YTbT7yvZJUOJUwc=";
   };
@@ -102,15 +103,24 @@ rustPlatform.buildRustPackage rec {
     '';
 
   __darwinAllowLocalNetworking = true;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
   passthru = {
     inherit libwg;
     inherit openvpn-mullvad;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Mullvad VPN command-line client tools";
     homepage = "https://github.com/mullvad/mullvadvpn-app";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ cole-h ];
+    changelog = "https://github.com/mullvad/mullvadvpn-app/blob/2025.2/CHANGELOG.md";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ cole-h ];
+    mainProgram = "mullvad";
   };
 }

From 8bd83413e170543fda4a85b755173763abdb4b06 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 25 Jan 2025 11:44:54 +0100
Subject: [PATCH 66/76] i3nator: remove

3 years since the last upstream commit.
---
 pkgs/by-name/i3/i3nator/package.nix | 27 ---------------------------
 pkgs/top-level/aliases.nix          |  1 +
 2 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 pkgs/by-name/i3/i3nator/package.nix

diff --git a/pkgs/by-name/i3/i3nator/package.nix b/pkgs/by-name/i3/i3nator/package.nix
deleted file mode 100644
index 3736bff99dda..000000000000
--- a/pkgs/by-name/i3/i3nator/package.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  rustPlatform,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "i3nator";
-  version = "1.2.0";
-
-  src = fetchFromGitHub {
-    owner = "pitkley";
-    repo = pname;
-    rev = version;
-    sha256 = "10rxvxq48dhzlw5p9fsj6x0ci4pap85s9b192zakgvk4h97ifp2p";
-  };
-
-  cargoHash = "sha256-74woBoLXuxE4v3iMvc+QWz5n5F5/peaFBgZu+3ULXRM=";
-
-  meta = with lib; {
-    description = "Tmuxinator for the i3 window manager";
-    homepage = "https://github.com/pitkley/i3nator";
-    license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ mpoquet ];
-    mainProgram = "i3nator";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1160cc91d436..48de8eb50e1d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -587,6 +587,7 @@ mapAliases {
   ### I ###
 
   i3-gaps = i3; # Added 2023-01-03
+  i3nator = throw "'i3nator' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   ib-tws = throw "ib-tws has been removed from nixpkgs as it was broken"; # Added 2024-07-15
   ib-controller = throw "ib-controller has been removed from nixpkgs as it was broken"; # Added 2024-07-15
   imagemagick7Big = throw "'imagemagick7Big' has been renamed to/replaced by 'imagemagickBig'"; # Converted to throw 2024-10-17

From 358b3d996735809c770cc74a99dc7f96494e1e2d Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 24 Jan 2025 22:08:27 +0100
Subject: [PATCH 67/76] ieda: useFetchCargoVendor

Cargo 1.84.0 seems to have changed the output format of cargo vendor
again, once again invalidating fetchCargoTarball FOD hashes.  It's
time to fix this once and for all, switching across the board to
fetchCargoVendor, which is not dependent on cargo vendor's output
format.
---
 pkgs/by-name/ie/ieda/rustpkgs.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ie/ieda/rustpkgs.nix b/pkgs/by-name/ie/ieda/rustpkgs.nix
index ede208786947..f02385b6136d 100644
--- a/pkgs/by-name/ie/ieda/rustpkgs.nix
+++ b/pkgs/by-name/ie/ieda/rustpkgs.nix
@@ -8,7 +8,8 @@ in
     version = "0.1.3";
     src = rootSrc;
     sourceRoot = "${src.name}/src/operation/iIR/source/iir-rust/iir";
-    cargoHash = "sha256-ka91IsmBGBYts4U9X4uZDUMeS9adPn3MKl2BY4ZKDCY=";
+    useFetchCargoVendor = true;
+    cargoHash = "sha256-xyNaUTPvU21yOdkQq8vdnHCyLzcpDAFAje0R/gDqliU=";
 
     doCheck = false;
 
@@ -19,7 +20,8 @@ in
     version = "0.1.0";
     src = rootSrc;
     sourceRoot = "${src.name}/src/database/manager/parser/liberty/lib-rust/liberty-parser";
-    cargoHash = "sha256-7yUD8M3efisuVoH3/R+Pk2CP4mizSinrqeuy3uqkq2c=";
+    useFetchCargoVendor = true;
+    cargoHash = "sha256-nRIOuSz5ImENvKeMAnthmBo+2/Jy5xbM66xkcfVCTMI=";
 
     doCheck = false;
 
@@ -30,7 +32,8 @@ in
     version = "0.1.0";
     src = rootSrc;
     sourceRoot = "${src.name}/src/database/manager/parser/sdf/sdf_parse";
-    cargoHash = "sha256-6uzufy3S21vHJYgx9sItxQyccG0g/Zz1r2xHsYoQPRM=";
+    useFetchCargoVendor = true;
+    cargoHash = "sha256-PORA/9DDIax4lOn/pzmi7Y8mCCBUphMTzbBsb64sDl0=";
 
     nativeBuildInputs = [ rustPlatform.bindgenHook ];
   };
@@ -39,7 +42,8 @@ in
     version = "0.2.4";
     src = rootSrc;
     sourceRoot = "${src.name}/src/database/manager/parser/spef/spef-parser";
-    cargoHash = "sha256-KTd3HVKV8hRCXf56FPksYGVJNDdlmMMIcSEk1MMGLsw=";
+    useFetchCargoVendor = true;
+    cargoHash = "sha256-Qr/oXTqn2gaxyAyLsRjaXNniNzIYVzPGefXTdkULmYk=";
 
     nativeBuildInputs = [ rustPlatform.bindgenHook ];
   };
@@ -48,7 +52,8 @@ in
     version = "0.1.0";
     src = rootSrc;
     sourceRoot = "${src.name}/src/database/manager/parser/vcd/vcd_parser";
-    cargoHash = "sha256-1y1nPNfx23MyIJUV+E6mMuDOhdob0BDGuQwOl0Le/lE=";
+    useFetchCargoVendor = true;
+    cargoHash = "sha256-xcfVzDrnW4w3fU7qo6xzSQeIH8sEbEyzPF92F5tDcAk=";
 
     doCheck = false;
 
@@ -59,7 +64,8 @@ in
     version = "0.1.0";
     src = rootSrc;
     sourceRoot = "${src.name}/src/database/manager/parser/verilog/verilog-rust/verilog-parser";
-    cargoHash = "sha256-Z/LXQzQ0m1lQdIPaWQ5rs2EAu/mbyi2JvrjGYVmKONs=";
+    useFetchCargoVendor = true;
+    cargoHash = "sha256-ooxY8Q8bfD+klBGfpTDD3YyWptEOGGHDoyamhjlSNTM=";
 
     doCheck = false;
 

From 389613f7308aefef09fd7ff24bbc4629e91331a8 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 24 Jan 2025 22:12:58 +0100
Subject: [PATCH 68/76] kapacitor: useFetchCargoVendor

Cargo 1.84.0 seems to have changed the output format of cargo vendor
again, once again invalidating fetchCargoTarball FOD hashes.  It's
time to fix this once and for all, switching across the board to
fetchCargoVendor, which is not dependent on cargo vendor's output
format.
---
 pkgs/by-name/ka/kapacitor/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ka/kapacitor/package.nix b/pkgs/by-name/ka/kapacitor/package.nix
index 3f58b489bc81..dacbcf2b4432 100644
--- a/pkgs/by-name/ka/kapacitor/package.nix
+++ b/pkgs/by-name/ka/kapacitor/package.nix
@@ -43,7 +43,8 @@ let
       })
     ];
     sourceRoot = "${src.name}/libflux";
-    cargoHash = "sha256-yIYeJvLe+L72ZyuQ2AK6l4HGSF/tgCyGQsXEOWUXDn0=";
+    useFetchCargoVendor = true;
+    cargoHash = "sha256-kbI1uUDE8JyFFtwV5k0EeeNGCZFQLXLobW/MilHX2Sg=";
     nativeBuildInputs = [ rustPlatform.bindgenHook ];
     buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
     pkgcfg = ''

From 642484d03656fca717c01f27b877fe935e91baa4 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 30 Jan 2025 11:17:41 +0100
Subject: [PATCH 69/76] rebazel: remove (#377074)

Upstream repo has been archived since 2023.
---
 pkgs/development/tools/rebazel/default.nix | 31 ----------------------
 pkgs/top-level/aliases.nix                 |  1 +
 pkgs/top-level/all-packages.nix            |  4 ---
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 pkgs/development/tools/rebazel/default.nix

diff --git a/pkgs/development/tools/rebazel/default.nix b/pkgs/development/tools/rebazel/default.nix
deleted file mode 100644
index 33592b76e853..000000000000
--- a/pkgs/development/tools/rebazel/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  lib,
-  stdenv,
-  rustPlatform,
-  fetchFromGitHub,
-  CoreServices,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "rebazel";
-  version = "0.1.4";
-
-  src = fetchFromGitHub {
-    owner = "meetup";
-    repo = "rebazel";
-    rev = "v${version}";
-    hash = "sha256-v84ZXhtJpejQmP61NmP06+qrtMu/0yb7UyD7U12xlME=";
-  };
-
-  cargoHash = "sha256-cBAm8LyNKEVJkhZJ+QZU5XtQutb1oNvad8xH70Bi2LM=";
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ CoreServices ];
-
-  meta = with lib; {
-    description = "tool for expediting bazel build workflows";
-    mainProgram = "rebazel";
-    homepage = "https://github.com/meetup/rebazel";
-    license = licenses.mit;
-    maintainers = with maintainers; [ zimbatm ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 48de8eb50e1d..c15766780974 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1200,6 +1200,7 @@ mapAliases {
   rambox-pro = rambox; # Added 2022-12-12
   rapidjson-unstable = lib.warnOnInstantiate "'rapidjson-unstable' has been renamed to 'rapidjson'" rapidjson; # Added 2024-07-28
   rargs = throw "'rargs' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
+  rebazel = throw "'rebazel' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
   redocly-cli = redocly; # Added 2024-04-14
   redpanda = redpanda-client; # Added 2023-10-14
   redpanda-server = throw "'redpanda-server' has been removed because it was broken for a long time"; # Added 2024-06-10
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c3febb3ba13..fbc8904616b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7596,10 +7596,6 @@ with pkgs;
   buildozer = bazel-buildtools;
   unused_deps = bazel-buildtools;
 
-  rebazel = callPackage ../development/tools/rebazel {
-    inherit (darwin.apple_sdk.frameworks) CoreServices;
-  };
-
   buildBazelPackage = darwin.apple_sdk_11_0.callPackage ../build-support/build-bazel-package { };
 
   binutils-unwrapped = callPackage ../development/tools/misc/binutils {

From 2a93bbc8c9232b6795eeb8ac01fa20283d4a3874 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Jan 2025 10:20:40 +0000
Subject: [PATCH 70/76] rewatch: 1.0.9 -> 1.0.10

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

diff --git a/pkgs/by-name/re/rewatch/package.nix b/pkgs/by-name/re/rewatch/package.nix
index e0ee1ebfc76b..b94e2d35073f 100644
--- a/pkgs/by-name/re/rewatch/package.nix
+++ b/pkgs/by-name/re/rewatch/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rewatch";
-  version = "1.0.9";
+  version = "1.0.10";
 
   src = fetchFromGitHub {
     owner = "rescript-lang";
     repo = "rewatch";
     tag = "v${version}";
-    hash = "sha256-y+0tBwGa7Fjrnd3O7CwZjapgXJojfgXBZyqAW3cz1Zk=";
+    hash = "sha256-9MowIppTEU2+g5T76qoZg2dOFyEo6uUmtZtzvuaqCrg=";
   };
 
-  cargoHash = "sha256-cZTA50gm7o+vBaRNjpZI0LQkXaHIukVTBXoYMUubZgw=";
+  cargoHash = "sha256-QLpzDzcQjHuMlnPLXdT5H6AsiK/xw7R8+zQuyCbnIEo=";
 
   doCheck = true;
 

From 2331f2fc4ba7df1971b846dd99bf7276e6fac29f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Jan 2025 10:22:21 +0000
Subject: [PATCH 71/76] nezha-theme-admin: 1.6.2 -> 1.6.4

---
 .../ne/nezha-theme-admin/package-lock.json    | 470 +++++++++---------
 pkgs/by-name/ne/nezha-theme-admin/package.nix |   6 +-
 2 files changed, 238 insertions(+), 238 deletions(-)

diff --git a/pkgs/by-name/ne/nezha-theme-admin/package-lock.json b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json
index f0d1f1869987..5f585a605d1a 100644
--- a/pkgs/by-name/ne/nezha-theme-admin/package-lock.json
+++ b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json
@@ -124,22 +124,22 @@
             }
         },
         "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==",
+            "version": "7.26.7",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.7.tgz",
+            "integrity": "sha512-SRijHmF0PSPgLIBYlWnG0hyeJLwXE2CgpsXaMOrtt2yp9/86ALw6oUlj9KYuZ0JN07T4eBMVIW4li/9S1j2BGA==",
             "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/code-frame": "^7.26.2",
+                "@babel/generator": "^7.26.5",
+                "@babel/helper-compilation-targets": "^7.26.5",
                 "@babel/helper-module-transforms": "^7.26.0",
-                "@babel/helpers": "^7.26.0",
-                "@babel/parser": "^7.26.0",
+                "@babel/helpers": "^7.26.7",
+                "@babel/parser": "^7.26.7",
                 "@babel/template": "^7.25.9",
-                "@babel/traverse": "^7.25.9",
-                "@babel/types": "^7.26.0",
+                "@babel/traverse": "^7.26.7",
+                "@babel/types": "^7.26.7",
                 "convert-source-map": "^2.0.0",
                 "debug": "^4.1.0",
                 "gensync": "^1.0.0-beta.2",
@@ -258,26 +258,26 @@
             }
         },
         "node_modules/@babel/helpers": {
-            "version": "7.26.0",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz",
-            "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==",
+            "version": "7.26.7",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.7.tgz",
+            "integrity": "sha512-8NHiL98vsi0mbPQmYAGWwfcFaOy4j2HY49fXJCfuDcdE7fMIsH9a7GdaeXpIBsbT7307WU8KCMp5pUVDNL4f9A==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/template": "^7.25.9",
-                "@babel/types": "^7.26.0"
+                "@babel/types": "^7.26.7"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.26.5",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.5.tgz",
-            "integrity": "sha512-SRJ4jYmXRqV1/Xc+TIVG84WjHBXKlxO9sHQnA2Pf12QQEAp1LOh6kDzNHXcUnbH1QI0FDoPPVOt+vyUDucxpaw==",
+            "version": "7.26.7",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.7.tgz",
+            "integrity": "sha512-kEvgGGgEjRUutvdVvZhbn/BxVt+5VSpwXz1j3WYXQbXDo8KzFOPNG2GQbdAiNq8g6wn1yKk7C/qrke03a84V+w==",
             "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.26.5"
+                "@babel/types": "^7.26.7"
             },
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -319,9 +319,9 @@
             }
         },
         "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==",
+            "version": "7.26.7",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.7.tgz",
+            "integrity": "sha512-AOPI3D+a8dXnja+iwsUqGRjr1BbZIe771sXdapOtYI531gSqpi92vXivKcq2asu/DFpdl1ceFAKZyRzK2PCVcQ==",
             "license": "MIT",
             "dependencies": {
                 "regenerator-runtime": "^0.14.0"
@@ -345,16 +345,16 @@
             }
         },
         "node_modules/@babel/traverse": {
-            "version": "7.26.5",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.5.tgz",
-            "integrity": "sha512-rkOSPOw+AXbgtwUga3U4u8RpoK9FEFWBNAlTpcnkLFjL5CT+oyHNuUUC/xx6XefEJ16r38r8Bc/lfp6rYuHeJQ==",
+            "version": "7.26.7",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.7.tgz",
+            "integrity": "sha512-1x1sgeyRLC3r5fQOM0/xtQKsYjyxmFjaOrLJNtZ81inNjyJHGIolTULPiSc/2qe1/qfpFLisLQYFnnZl7QoedA==",
             "license": "MIT",
             "dependencies": {
                 "@babel/code-frame": "^7.26.2",
                 "@babel/generator": "^7.26.5",
-                "@babel/parser": "^7.26.5",
+                "@babel/parser": "^7.26.7",
                 "@babel/template": "^7.25.9",
-                "@babel/types": "^7.26.5",
+                "@babel/types": "^7.26.7",
                 "debug": "^4.3.1",
                 "globals": "^11.1.0"
             },
@@ -372,9 +372,9 @@
             }
         },
         "node_modules/@babel/types": {
-            "version": "7.26.5",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.5.tgz",
-            "integrity": "sha512-L6mZmwFDK6Cjh1nRCLXpa6no13ZIioJDz7mdkzHv399pThrTa/k0nUlNaenOeh2kWu/iaOQYElEpKPUswUa9Vg==",
+            "version": "7.26.7",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.7.tgz",
+            "integrity": "sha512-t8kDRGrKXyp6+tjUh7hw2RLyclsW4TRoRvRHtSyAX9Bb5ldlFh+90YAYY6awRXrlB4G5G2izNeGySpATlFzmOg==",
             "license": "MIT",
             "dependencies": {
                 "@babel/helper-string-parser": "^7.25.9",
@@ -883,9 +883,9 @@
             }
         },
         "node_modules/@eslint/js": {
-            "version": "9.18.0",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.18.0.tgz",
-            "integrity": "sha512-fK6L7rxcq6/z+AaQMtiFTkvbHkBLNlwyRxHpKawP0x3u9+NC6MQTnFW+AdpwC6gfHTW0051cokQgtTN2FqlxQA==",
+            "version": "9.19.0",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.19.0.tgz",
+            "integrity": "sha512-rbq9/g38qjfqFLOVPvwjIvFFdNziEC5S65jmjPw5r6A//QH+W91akh9irMwjDN8zKUTak6W9EsAv4m/7Wnw0UQ==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -1159,15 +1159,15 @@
             "license": "MIT"
         },
         "node_modules/@radix-ui/react-alert-dialog": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.4.tgz",
-            "integrity": "sha512-A6Kh23qZDLy3PSU4bh2UJZznOrUdHImIXqF8YtUa6CN73f8EOO9XlXSCd9IHyPvIquTaa/kwaSWzZTtUvgXVGw==",
+            "version": "1.1.5",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.5.tgz",
+            "integrity": "sha512-1Y2sI17QzSZP58RjGtrklfSGIf3AF7U/HkD3aAcAnhOUJrm7+7GG1wRDFaUlSe0nW5B/t4mYd/+7RNbP2Wexug==",
             "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-dialog": "1.1.4",
+                "@radix-ui/react-dialog": "1.1.5",
                 "@radix-ui/react-primitive": "2.0.1",
                 "@radix-ui/react-slot": "1.1.1"
             },
@@ -1322,15 +1322,15 @@
             }
         },
         "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==",
+            "version": "1.1.5",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.5.tgz",
+            "integrity": "sha512-LaO3e5h/NOEL4OfXjxD43k9Dx+vn+8n+PCFt6uhX/BADFflllyv3WJG6rgvvSVBxpTch938Qq/LGc2MMxipXPw==",
             "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-dismissable-layer": "1.1.4",
                 "@radix-ui/react-focus-guards": "1.1.1",
                 "@radix-ui/react-focus-scope": "1.1.1",
                 "@radix-ui/react-id": "1.1.0",
@@ -1339,8 +1339,8 @@
                 "@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"
+                "aria-hidden": "^1.2.4",
+                "react-remove-scroll": "^2.6.2"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1373,9 +1373,9 @@
             }
         },
         "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==",
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.4.tgz",
+            "integrity": "sha512-XDUI0IVYVSwjMXxM6P4Dfti7AH+Y4oS/TB+sglZ/EXc7cqLwGAmp1NlMrcUjj7ks6R5WTZuWKv44FBbLpwU3sA==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/primitive": "1.1.1",
@@ -1400,16 +1400,16 @@
             }
         },
         "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==",
+            "version": "2.1.5",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.5.tgz",
+            "integrity": "sha512-50ZmEFL1kOuLalPKHrLWvPFMons2fGx9TqQCWlPwDVpbAnaUJ1g4XNcKqFNMQymYU0kKWR4MDDi+9vUQBGFgcQ==",
             "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-menu": "2.1.5",
                 "@radix-ui/react-primitive": "2.0.1",
                 "@radix-ui/react-use-controllable-state": "1.1.0"
             },
@@ -1510,9 +1510,9 @@
             }
         },
         "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==",
+            "version": "2.1.5",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.5.tgz",
+            "integrity": "sha512-uH+3w5heoMJtqVCgYOtYVMECk1TOrkUn0OG0p5MqXC0W2ppcuVeESbou8PTHoqAjbdTEK19AGXBWcEtR5WpEQg==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/primitive": "1.1.1",
@@ -1520,7 +1520,7 @@
                 "@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-dismissable-layer": "1.1.4",
                 "@radix-ui/react-focus-guards": "1.1.1",
                 "@radix-ui/react-focus-scope": "1.1.1",
                 "@radix-ui/react-id": "1.1.0",
@@ -1531,8 +1531,8 @@
                 "@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"
+                "aria-hidden": "^1.2.4",
+                "react-remove-scroll": "^2.6.2"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1550,9 +1550,9 @@
             }
         },
         "node_modules/@radix-ui/react-navigation-menu": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.3.tgz",
-            "integrity": "sha512-IQWAsQ7dsLIYDrn0WqPU+cdM7MONTv9nqrLVYoie3BPiabSfUVDe6Fr+oEt0Cofsr9ONDcDe9xhmJbL1Uq1yKg==",
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.4.tgz",
+            "integrity": "sha512-wUi01RrTDTOoGtjEPHsxlzPtVzVc3R/AZ5wfh0dyqMAqolhHAHvG5iQjBCTi2AjQqa77FWWbA3kE3RkD+bDMgQ==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/primitive": "1.1.1",
@@ -1560,7 +1560,7 @@
                 "@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-dismissable-layer": "1.1.4",
                 "@radix-ui/react-id": "1.1.0",
                 "@radix-ui/react-presence": "1.1.2",
                 "@radix-ui/react-primitive": "2.0.1",
@@ -1586,15 +1586,15 @@
             }
         },
         "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==",
+            "version": "1.1.5",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.5.tgz",
+            "integrity": "sha512-YXkTAftOIW2Bt3qKH8vYr6n9gCkVrvyvfiTObVjoHVTHnNj26rmvO87IKa3VgtgCjb8FAQ6qOjNViwl+9iIzlg==",
             "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-dismissable-layer": "1.1.4",
                 "@radix-ui/react-focus-guards": "1.1.1",
                 "@radix-ui/react-focus-scope": "1.1.1",
                 "@radix-ui/react-id": "1.1.0",
@@ -1604,8 +1604,8 @@
                 "@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"
+                "aria-hidden": "^1.2.4",
+                "react-remove-scroll": "^2.6.2"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -1788,9 +1788,9 @@
             }
         },
         "node_modules/@radix-ui/react-select": {
-            "version": "2.1.4",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.1.4.tgz",
-            "integrity": "sha512-pOkb2u8KgO47j/h7AylCj7dJsm69BXcjkrvTqMptFqsE2i0p8lHkfgneXKjAgPzBMivnoMyt8o4KiV4wYzDdyQ==",
+            "version": "2.1.5",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.1.5.tgz",
+            "integrity": "sha512-eVV7N8jBXAXnyrc+PsOF89O9AfVgGnbLxUtBb0clJ8y8ENMWLARGMI/1/SBRLz7u4HqxLgN71BJ17eono3wcjA==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/number": "1.1.0",
@@ -1799,7 +1799,7 @@
                 "@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-dismissable-layer": "1.1.4",
                 "@radix-ui/react-focus-guards": "1.1.1",
                 "@radix-ui/react-focus-scope": "1.1.1",
                 "@radix-ui/react-id": "1.1.0",
@@ -1812,8 +1812,8 @@
                 "@radix-ui/react-use-layout-effect": "1.1.0",
                 "@radix-ui/react-use-previous": "1.1.0",
                 "@radix-ui/react-visually-hidden": "1.1.1",
-                "aria-hidden": "^1.1.1",
-                "react-remove-scroll": "^2.6.1"
+                "aria-hidden": "^1.2.4",
+                "react-remove-scroll": "^2.6.2"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -2057,9 +2057,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.31.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.31.0.tgz",
-            "integrity": "sha512-9NrR4033uCbUBRgvLcBrJofa2KY9DzxL2UKZ1/4xA/mnTNyhZCWBuD8X3tPm1n4KxcgaraOYgrFKSgwjASfmlA==",
+            "version": "4.32.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.32.1.tgz",
+            "integrity": "sha512-/pqA4DmqyCm8u5YIDzIdlLcEmuvxb0v8fZdFhVMszSpDTgbQKdw3/mB3eMUHIbubtJ6F9j+LtmyCnHTEqIHyzA==",
             "cpu": [
                 "arm"
             ],
@@ -2071,9 +2071,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.31.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.31.0.tgz",
-            "integrity": "sha512-iBbODqT86YBFHajxxF8ebj2hwKm1k8PTBQSojSt3d1FFt1gN+xf4CowE47iN0vOSdnd+5ierMHBbu/rHc7nq5g==",
+            "version": "4.32.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.32.1.tgz",
+            "integrity": "sha512-If3PDskT77q7zgqVqYuj7WG3WC08G1kwXGVFi9Jr8nY6eHucREHkfpX79c0ACAjLj3QIWKPJR7w4i+f5EdLH5Q==",
             "cpu": [
                 "arm64"
             ],
@@ -2085,9 +2085,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.31.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.31.0.tgz",
-            "integrity": "sha512-WHIZfXgVBX30SWuTMhlHPXTyN20AXrLH4TEeH/D0Bolvx9PjgZnn4H677PlSGvU6MKNsjCQJYczkpvBbrBnG6g==",
+            "version": "4.32.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.32.1.tgz",
+            "integrity": "sha512-zCpKHioQ9KgZToFp5Wvz6zaWbMzYQ2LJHQ+QixDKq52KKrF65ueu6Af4hLlLWHjX1Wf/0G5kSJM9PySW9IrvHA==",
             "cpu": [
                 "arm64"
             ],
@@ -2099,9 +2099,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.31.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.31.0.tgz",
-            "integrity": "sha512-hrWL7uQacTEF8gdrQAqcDy9xllQ0w0zuL1wk1HV8wKGSGbKPVjVUv/DEwT2+Asabf8Dh/As+IvfdU+H8hhzrQQ==",
+            "version": "4.32.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.32.1.tgz",
+            "integrity": "sha512-sFvF+t2+TyUo/ZQqUcifrJIgznx58oFZbdHS9TvHq3xhPVL9nOp+yZ6LKrO9GWTP+6DbFtoyLDbjTpR62Mbr3Q==",
             "cpu": [
                 "x64"
             ],
@@ -2113,9 +2113,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.31.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.31.0.tgz",
-            "integrity": "sha512-S2oCsZ4hJviG1QjPY1h6sVJLBI6ekBeAEssYKad1soRFv3SocsQCzX6cwnk6fID6UQQACTjeIMB+hyYrFacRew==",
+            "version": "4.32.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.32.1.tgz",
+            "integrity": "sha512-NbOa+7InvMWRcY9RG+B6kKIMD/FsnQPH0MWUvDlQB1iXnF/UcKSudCXZtv4lW+C276g3w5AxPbfry5rSYvyeYA==",
             "cpu": [
                 "arm64"
             ],
@@ -2127,9 +2127,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.31.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.31.0.tgz",
-            "integrity": "sha512-pCANqpynRS4Jirn4IKZH4tnm2+2CqCNLKD7gAdEjzdLGbH1iO0zouHz4mxqg0uEMpO030ejJ0aA6e1PJo2xrPA==",
+            "version": "4.32.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.32.1.tgz",
+            "integrity": "sha512-JRBRmwvHPXR881j2xjry8HZ86wIPK2CcDw0EXchE1UgU0ubWp9nvlT7cZYKc6bkypBt745b4bglf3+xJ7hXWWw==",
             "cpu": [
                 "x64"
             ],
@@ -2141,9 +2141,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.31.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.31.0.tgz",
-            "integrity": "sha512-0O8ViX+QcBd3ZmGlcFTnYXZKGbFu09EhgD27tgTdGnkcYXLat4KIsBBQeKLR2xZDCXdIBAlWLkiXE1+rJpCxFw==",
+            "version": "4.32.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.32.1.tgz",
+            "integrity": "sha512-PKvszb+9o/vVdUzCCjL0sKHukEQV39tD3fepXxYrHE3sTKrRdCydI7uldRLbjLmDA3TFDmh418XH19NOsDRH8g==",
             "cpu": [
                 "arm"
             ],
@@ -2155,9 +2155,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.31.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.31.0.tgz",
-            "integrity": "sha512-w5IzG0wTVv7B0/SwDnMYmbr2uERQp999q8FMkKG1I+j8hpPX2BYFjWe69xbhbP6J9h2gId/7ogesl9hwblFwwg==",
+            "version": "4.32.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.32.1.tgz",
+            "integrity": "sha512-9WHEMV6Y89eL606ReYowXuGF1Yb2vwfKWKdD1A5h+OYnPZSJvxbEjxTRKPgi7tkP2DSnW0YLab1ooy+i/FQp/Q==",
             "cpu": [
                 "arm"
             ],
@@ -2169,9 +2169,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.31.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.31.0.tgz",
-            "integrity": "sha512-JyFFshbN5xwy6fulZ8B/8qOqENRmDdEkcIMF0Zz+RsfamEW+Zabl5jAb0IozP/8UKnJ7g2FtZZPEUIAlUSX8cA==",
+            "version": "4.32.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.32.1.tgz",
+            "integrity": "sha512-tZWc9iEt5fGJ1CL2LRPw8OttkCBDs+D8D3oEM8mH8S1ICZCtFJhD7DZ3XMGM8kpqHvhGUTvNUYVDnmkj4BDXnw==",
             "cpu": [
                 "arm64"
             ],
@@ -2183,9 +2183,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.31.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.31.0.tgz",
-            "integrity": "sha512-kpQXQ0UPFeMPmPYksiBL9WS/BDiQEjRGMfklVIsA0Sng347H8W2iexch+IEwaR7OVSKtr2ZFxggt11zVIlZ25g==",
+            "version": "4.32.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.32.1.tgz",
+            "integrity": "sha512-FTYc2YoTWUsBz5GTTgGkRYYJ5NGJIi/rCY4oK/I8aKowx1ToXeoVVbIE4LGAjsauvlhjfl0MYacxClLld1VrOw==",
             "cpu": [
                 "arm64"
             ],
@@ -2197,9 +2197,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-            "version": "4.31.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.31.0.tgz",
-            "integrity": "sha512-pMlxLjt60iQTzt9iBb3jZphFIl55a70wexvo8p+vVFK+7ifTRookdoXX3bOsRdmfD+OKnMozKO6XM4zR0sHRrQ==",
+            "version": "4.32.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.32.1.tgz",
+            "integrity": "sha512-F51qLdOtpS6P1zJVRzYM0v6MrBNypyPEN1GfMiz0gPu9jN8ScGaEFIZQwteSsGKg799oR5EaP7+B2jHgL+d+Kw==",
             "cpu": [
                 "loong64"
             ],
@@ -2211,9 +2211,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.31.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.31.0.tgz",
-            "integrity": "sha512-D7TXT7I/uKEuWiRkEFbed1UUYZwcJDU4vZQdPTcepK7ecPhzKOYk4Er2YR4uHKme4qDeIh6N3XrLfpuM7vzRWQ==",
+            "version": "4.32.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.32.1.tgz",
+            "integrity": "sha512-wO0WkfSppfX4YFm5KhdCCpnpGbtgQNj/tgvYzrVYFKDpven8w2N6Gg5nB6w+wAMO3AIfSTWeTjfVe+uZ23zAlg==",
             "cpu": [
                 "ppc64"
             ],
@@ -2225,9 +2225,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.31.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.31.0.tgz",
-            "integrity": "sha512-wal2Tc8O5lMBtoePLBYRKj2CImUCJ4UNGJlLwspx7QApYny7K1cUYlzQ/4IGQBLmm+y0RS7dwc3TDO/pmcneTw==",
+            "version": "4.32.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.32.1.tgz",
+            "integrity": "sha512-iWswS9cIXfJO1MFYtI/4jjlrGb/V58oMu4dYJIKnR5UIwbkzR0PJ09O0PDZT0oJ3LYWXBSWahNf/Mjo6i1E5/g==",
             "cpu": [
                 "riscv64"
             ],
@@ -2239,9 +2239,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.31.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.31.0.tgz",
-            "integrity": "sha512-O1o5EUI0+RRMkK9wiTVpk2tyzXdXefHtRTIjBbmFREmNMy7pFeYXCFGbhKFwISA3UOExlo5GGUuuj3oMKdK6JQ==",
+            "version": "4.32.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.32.1.tgz",
+            "integrity": "sha512-RKt8NI9tebzmEthMnfVgG3i/XeECkMPS+ibVZjZ6mNekpbbUmkNWuIN2yHsb/mBPyZke4nlI4YqIdFPgKuoyQQ==",
             "cpu": [
                 "s390x"
             ],
@@ -2253,9 +2253,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.31.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.31.0.tgz",
-            "integrity": "sha512-zSoHl356vKnNxwOWnLd60ixHNPRBglxpv2g7q0Cd3Pmr561gf0HiAcUBRL3S1vPqRC17Zo2CX/9cPkqTIiai1g==",
+            "version": "4.32.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.32.1.tgz",
+            "integrity": "sha512-WQFLZ9c42ECqEjwg/GHHsouij3pzLXkFdz0UxHa/0OM12LzvX7DzedlY0SIEly2v18YZLRhCRoHZDxbBSWoGYg==",
             "cpu": [
                 "x64"
             ],
@@ -2267,9 +2267,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.31.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.31.0.tgz",
-            "integrity": "sha512-ypB/HMtcSGhKUQNiFwqgdclWNRrAYDH8iMYH4etw/ZlGwiTVxBz2tDrGRrPlfZu6QjXwtd+C3Zib5pFqID97ZA==",
+            "version": "4.32.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.32.1.tgz",
+            "integrity": "sha512-BLoiyHDOWoS3uccNSADMza6V6vCNiphi94tQlVIL5de+r6r/CCQuNnerf+1g2mnk2b6edp5dk0nhdZ7aEjOBsA==",
             "cpu": [
                 "x64"
             ],
@@ -2281,9 +2281,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.31.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.31.0.tgz",
-            "integrity": "sha512-JuhN2xdI/m8Hr+aVO3vspO7OQfUFO6bKLIRTAy0U15vmWjnZDLrEgCZ2s6+scAYaQVpYSh9tZtRijApw9IXyMw==",
+            "version": "4.32.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.32.1.tgz",
+            "integrity": "sha512-w2l3UnlgYTNNU+Z6wOR8YdaioqfEnwPjIsJ66KxKAf0p+AuL2FHeTX6qvM+p/Ue3XPBVNyVSfCrfZiQh7vZHLQ==",
             "cpu": [
                 "arm64"
             ],
@@ -2295,9 +2295,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.31.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.31.0.tgz",
-            "integrity": "sha512-U1xZZXYkvdf5MIWmftU8wrM5PPXzyaY1nGCI4KI4BFfoZxHamsIe+BtnPLIvvPykvQWlVbqUXdLa4aJUuilwLQ==",
+            "version": "4.32.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.32.1.tgz",
+            "integrity": "sha512-Am9H+TGLomPGkBnaPWie4F3x+yQ2rr4Bk2jpwy+iV+Gel9jLAu/KqT8k3X4jxFPW6Zf8OMnehyutsd+eHoq1WQ==",
             "cpu": [
                 "ia32"
             ],
@@ -2309,9 +2309,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.31.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.31.0.tgz",
-            "integrity": "sha512-ul8rnCsUumNln5YWwz0ted2ZHFhzhRRnkpBZ+YRuHoRAlUji9KChpOUOndY7uykrPEPXVbHLlsdo6v5yXo/TXw==",
+            "version": "4.32.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.32.1.tgz",
+            "integrity": "sha512-ar80GhdZb4DgmW3myIS9nRFYcpJRSME8iqWgzH2i44u+IdrzmiXVxeFnExQ5v4JYUSpg94bWjevMG8JHf1Da5Q==",
             "cpu": [
                 "x64"
             ],
@@ -2356,15 +2356,15 @@
             }
         },
         "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==",
+            "version": "5.2.2",
+            "resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-5.2.2.tgz",
+            "integrity": "sha512-fYDQA9e6yTNmA13TLVSA+WMQRc5Bn/c0EUBditUHNfMMxN7M82c38b1kEggVE3pLpZ0FwkwJkUEKMiOi52JXFA==",
             "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",
+                "@babel/generator": "^7.26.5",
+                "@babel/parser": "^7.26.7",
+                "@babel/traverse": "^7.26.7",
+                "@babel/types": "^7.26.7",
                 "javascript-natural-sort": "^0.7.1",
                 "lodash": "^4.17.21"
             },
@@ -2455,9 +2455,9 @@
             "license": "MIT"
         },
         "node_modules/@types/node": {
-            "version": "22.10.7",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.7.tgz",
-            "integrity": "sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg==",
+            "version": "22.12.0",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.12.0.tgz",
+            "integrity": "sha512-Fll2FZ1riMjNmlmJOdAyY5pUbkftXslB5DgEzlIuNaiWhXd00FhWxVC/r4yV/4wBb9JfImTu+jiSvXTkJ7F/gA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2500,17 +2500,17 @@
             "license": "MIT"
         },
         "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "8.21.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.21.0.tgz",
-            "integrity": "sha512-eTH+UOR4I7WbdQnG4Z48ebIA6Bgi7WO8HvFEneeYBxG8qCOYgTOFPSg6ek9ITIDvGjDQzWHcoWHCDO2biByNzA==",
+            "version": "8.22.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.22.0.tgz",
+            "integrity": "sha512-4Uta6REnz/xEJMvwf72wdUnC3rr4jAQf5jnTkeRQ9b6soxLxhDEbS/pfMPoJLDfFPNVRdryqWUIV/2GZzDJFZw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/regexpp": "^4.10.0",
-                "@typescript-eslint/scope-manager": "8.21.0",
-                "@typescript-eslint/type-utils": "8.21.0",
-                "@typescript-eslint/utils": "8.21.0",
-                "@typescript-eslint/visitor-keys": "8.21.0",
+                "@typescript-eslint/scope-manager": "8.22.0",
+                "@typescript-eslint/type-utils": "8.22.0",
+                "@typescript-eslint/utils": "8.22.0",
+                "@typescript-eslint/visitor-keys": "8.22.0",
                 "graphemer": "^1.4.0",
                 "ignore": "^5.3.1",
                 "natural-compare": "^1.4.0",
@@ -2530,16 +2530,16 @@
             }
         },
         "node_modules/@typescript-eslint/parser": {
-            "version": "8.21.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.21.0.tgz",
-            "integrity": "sha512-Wy+/sdEH9kI3w9civgACwabHbKl+qIOu0uFZ9IMKzX3Jpv9og0ZBJrZExGrPpFAY7rWsXuxs5e7CPPP17A4eYA==",
+            "version": "8.22.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.22.0.tgz",
+            "integrity": "sha512-MqtmbdNEdoNxTPzpWiWnqNac54h8JDAmkWtJExBVVnSrSmi9z+sZUt0LfKqk9rjqmKOIeRhO4fHHJ1nQIjduIQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/scope-manager": "8.21.0",
-                "@typescript-eslint/types": "8.21.0",
-                "@typescript-eslint/typescript-estree": "8.21.0",
-                "@typescript-eslint/visitor-keys": "8.21.0",
+                "@typescript-eslint/scope-manager": "8.22.0",
+                "@typescript-eslint/types": "8.22.0",
+                "@typescript-eslint/typescript-estree": "8.22.0",
+                "@typescript-eslint/visitor-keys": "8.22.0",
                 "debug": "^4.3.4"
             },
             "engines": {
@@ -2555,14 +2555,14 @@
             }
         },
         "node_modules/@typescript-eslint/scope-manager": {
-            "version": "8.21.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.21.0.tgz",
-            "integrity": "sha512-G3IBKz0/0IPfdeGRMbp+4rbjfSSdnGkXsM/pFZA8zM9t9klXDnB/YnKOBQ0GoPmoROa4bCq2NeHgJa5ydsQ4mA==",
+            "version": "8.22.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.22.0.tgz",
+            "integrity": "sha512-/lwVV0UYgkj7wPSw0o8URy6YI64QmcOdwHuGuxWIYznO6d45ER0wXUbksr9pYdViAofpUCNJx/tAzNukgvaaiQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.21.0",
-                "@typescript-eslint/visitor-keys": "8.21.0"
+                "@typescript-eslint/types": "8.22.0",
+                "@typescript-eslint/visitor-keys": "8.22.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2573,14 +2573,14 @@
             }
         },
         "node_modules/@typescript-eslint/type-utils": {
-            "version": "8.21.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.21.0.tgz",
-            "integrity": "sha512-95OsL6J2BtzoBxHicoXHxgk3z+9P3BEcQTpBKriqiYzLKnM2DeSqs+sndMKdamU8FosiadQFT3D+BSL9EKnAJQ==",
+            "version": "8.22.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.22.0.tgz",
+            "integrity": "sha512-NzE3aB62fDEaGjaAYZE4LH7I1MUwHooQ98Byq0G0y3kkibPJQIXVUspzlFOmOfHhiDLwKzMlWxaNv+/qcZurJA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/typescript-estree": "8.21.0",
-                "@typescript-eslint/utils": "8.21.0",
+                "@typescript-eslint/typescript-estree": "8.22.0",
+                "@typescript-eslint/utils": "8.22.0",
                 "debug": "^4.3.4",
                 "ts-api-utils": "^2.0.0"
             },
@@ -2597,9 +2597,9 @@
             }
         },
         "node_modules/@typescript-eslint/types": {
-            "version": "8.21.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.21.0.tgz",
-            "integrity": "sha512-PAL6LUuQwotLW2a8VsySDBwYMm129vFm4tMVlylzdoTybTHaAi0oBp7Ac6LhSrHHOdLM3efH+nAR6hAWoMF89A==",
+            "version": "8.22.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.22.0.tgz",
+            "integrity": "sha512-0S4M4baNzp612zwpD4YOieP3VowOARgK2EkN/GBn95hpyF8E2fbMT55sRHWBq+Huaqk3b3XK+rxxlM8sPgGM6A==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -2611,14 +2611,14 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "8.21.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.21.0.tgz",
-            "integrity": "sha512-x+aeKh/AjAArSauz0GiQZsjT8ciadNMHdkUSwBB9Z6PrKc/4knM4g3UfHml6oDJmKC88a6//cdxnO/+P2LkMcg==",
+            "version": "8.22.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.22.0.tgz",
+            "integrity": "sha512-SJX99NAS2ugGOzpyhMza/tX+zDwjvwAtQFLsBo3GQxiGcvaKlqGBkmZ+Y1IdiSi9h4Q0Lr5ey+Cp9CGWNY/F/w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.21.0",
-                "@typescript-eslint/visitor-keys": "8.21.0",
+                "@typescript-eslint/types": "8.22.0",
+                "@typescript-eslint/visitor-keys": "8.22.0",
                 "debug": "^4.3.4",
                 "fast-glob": "^3.3.2",
                 "is-glob": "^4.0.3",
@@ -2664,9 +2664,9 @@
             }
         },
         "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==",
+            "version": "7.7.0",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.0.tgz",
+            "integrity": "sha512-DrfFnPzblFmNrIZzg5RzHegbiRWg7KMR7btwi2yjHwx06zsUbO5g613sVwEV7FTwmzJu+Io0lJe2GJ3LxqpvBQ==",
             "dev": true,
             "license": "ISC",
             "bin": {
@@ -2677,16 +2677,16 @@
             }
         },
         "node_modules/@typescript-eslint/utils": {
-            "version": "8.21.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.21.0.tgz",
-            "integrity": "sha512-xcXBfcq0Kaxgj7dwejMbFyq7IOHgpNMtVuDveK7w3ZGwG9owKzhALVwKpTF2yrZmEwl9SWdetf3fxNzJQaVuxw==",
+            "version": "8.22.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.22.0.tgz",
+            "integrity": "sha512-T8oc1MbF8L+Bk2msAvCUzjxVB2Z2f+vXYfcucE2wOmYs7ZUwco5Ep0fYZw8quNwOiw9K8GYVL+Kgc2pETNTLOg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.4.0",
-                "@typescript-eslint/scope-manager": "8.21.0",
-                "@typescript-eslint/types": "8.21.0",
-                "@typescript-eslint/typescript-estree": "8.21.0"
+                "@typescript-eslint/scope-manager": "8.22.0",
+                "@typescript-eslint/types": "8.22.0",
+                "@typescript-eslint/typescript-estree": "8.22.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2701,13 +2701,13 @@
             }
         },
         "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "8.21.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.21.0.tgz",
-            "integrity": "sha512-BkLMNpdV6prozk8LlyK/SOoWLmUFi+ZD+pcqti9ILCbVvHGk1ui1g4jJOc2WDLaeExz2qWwojxlPce5PljcT3w==",
+            "version": "8.22.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.22.0.tgz",
+            "integrity": "sha512-AWpYAXnUgvLNabGTy3uBylkgZoosva/miNd1I8Bz3SjotmQPbVqhO4Cczo8AsZ44XVErEBPr/CRSgaj8sG7g0w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.21.0",
+                "@typescript-eslint/types": "8.22.0",
                 "eslint-visitor-keys": "^4.2.0"
             },
             "engines": {
@@ -3012,9 +3012,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001695",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001695.tgz",
-            "integrity": "sha512-vHyLade6wTgI2u1ec3WQBxv+2BrTERV28UXQu9LO6lZ9pYeMk34vjXFLOxo1A4UBA8XTL4njRQZdno/yYaSmWw==",
+            "version": "1.0.30001696",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001696.tgz",
+            "integrity": "sha512-pDCPkvzfa39ehJtJ+OwGT/2yvT2SbjfHhiIW2LWOAcMQ7BzwxT/XuyUp4OTOd0XFWA6BKw0JalnBHgSi5DGJBQ==",
             "dev": true,
             "funding": [
                 {
@@ -3378,9 +3378,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.84",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.84.tgz",
-            "integrity": "sha512-I+DQ8xgafao9Ha6y0qjHHvpZ9OfyA1qKlkHkjywxzniORU2awxyz7f/iVJcULmrF2yrM3nHQf+iDjJtbbexd/g==",
+            "version": "1.5.90",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.90.tgz",
+            "integrity": "sha512-C3PN4aydfW91Natdyd449Kw+BzhLmof6tzy5W1pFC5SpQxVXT+oyiyOG9AgYYSN9OdA/ik3YkCrpwqI8ug5Tug==",
             "dev": true,
             "license": "ISC"
         },
@@ -3480,9 +3480,9 @@
             }
         },
         "node_modules/eslint": {
-            "version": "9.18.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.18.0.tgz",
-            "integrity": "sha512-+waTfRWQlSbpt3KWE+CjrPPYnbq9kfZIYUqapc0uBXyjTp8aYXZDsUH16m39Ryq3NjAVP4tjuF7KaukeqoCoaA==",
+            "version": "9.19.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.19.0.tgz",
+            "integrity": "sha512-ug92j0LepKlbbEv6hD911THhoRHmbdXt2gX+VDABAW/Ir7D3nqKdv5Pf5vtlyY6HQMTEP2skXY43ueqTCWssEA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -3491,7 +3491,7 @@
                 "@eslint/config-array": "^0.19.0",
                 "@eslint/core": "^0.10.0",
                 "@eslint/eslintrc": "^3.2.0",
-                "@eslint/js": "9.18.0",
+                "@eslint/js": "9.19.0",
                 "@eslint/plugin-kit": "^0.2.5",
                 "@humanfs/node": "^0.16.6",
                 "@humanwhocodes/module-importer": "^1.0.1",
@@ -4021,9 +4021,9 @@
             "license": "MIT"
         },
         "node_modules/i18next": {
-            "version": "24.2.1",
-            "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.1.tgz",
-            "integrity": "sha512-Q2wC1TjWcSikn1VAJg13UGIjc+okpFxQTxjVAymOnSA3RpttBQNMPf2ovcgoFVsV4QNxTfNZMAxorXZXsk4fBA==",
+            "version": "24.2.2",
+            "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.2.tgz",
+            "integrity": "sha512-NE6i86lBCKRYZa5TaUDkU5S4HFgLIEJRLr3Whf2psgaxBleQ2LC1YW1Vc+SCgkAW7VEzndT6al6+CzegSUHcTQ==",
             "funding": [
                 {
                     "type": "individual",
@@ -5047,9 +5047,9 @@
             }
         },
         "node_modules/prettier-plugin-tailwindcss": {
-            "version": "0.6.10",
-            "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.10.tgz",
-            "integrity": "sha512-ndj2WLDaMzACnr1gAYZiZZLs5ZdOeBYgOsbBmHj3nvW/6q8h8PymsXiEnKvj/9qgCCAoHyvLOisoQdIcsDvIgw==",
+            "version": "0.6.11",
+            "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.11.tgz",
+            "integrity": "sha512-YxaYSIvZPAqhrrEpRtonnrXdghZg1irNg4qrjboCXrpybLWVs55cW2N3juhspVJiO0JBvYJT8SYsJpc8OQSnsA==",
             "license": "MIT",
             "engines": {
                 "node": ">=14.21.3"
@@ -5228,16 +5228,16 @@
             }
         },
         "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==",
+            "version": "2.6.3",
+            "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.6.3.tgz",
+            "integrity": "sha512-pnAi91oOk8g8ABQKGF5/M9qxmmOPxaAnopyTHYfqYEwJhyFrbbBtHuSgtKEoH0jpcxx5o3hXqH1mNd9/Oi+8iQ==",
             "license": "MIT",
             "dependencies": {
                 "react-remove-scroll-bar": "^2.3.7",
-                "react-style-singleton": "^2.2.1",
+                "react-style-singleton": "^2.2.3",
                 "tslib": "^2.1.0",
                 "use-callback-ref": "^1.3.3",
-                "use-sidecar": "^1.1.2"
+                "use-sidecar": "^1.1.3"
             },
             "engines": {
                 "node": ">=10"
@@ -5429,9 +5429,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.31.0",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.31.0.tgz",
-            "integrity": "sha512-9cCE8P4rZLx9+PjoyqHLs31V9a9Vpvfo4qNcs6JCiGWYhw2gijSetFbH6SSy1whnkgcefnUwr8sad7tgqsGvnw==",
+            "version": "4.32.1",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.32.1.tgz",
+            "integrity": "sha512-z+aeEsOeEa3mEbS1Tjl6sAZ8NE3+AalQz1RJGj81M+fizusbdDMoEJwdJNHfaB40Scr4qNu+welOfes7maKonA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -5445,25 +5445,25 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.31.0",
-                "@rollup/rollup-android-arm64": "4.31.0",
-                "@rollup/rollup-darwin-arm64": "4.31.0",
-                "@rollup/rollup-darwin-x64": "4.31.0",
-                "@rollup/rollup-freebsd-arm64": "4.31.0",
-                "@rollup/rollup-freebsd-x64": "4.31.0",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.31.0",
-                "@rollup/rollup-linux-arm-musleabihf": "4.31.0",
-                "@rollup/rollup-linux-arm64-gnu": "4.31.0",
-                "@rollup/rollup-linux-arm64-musl": "4.31.0",
-                "@rollup/rollup-linux-loongarch64-gnu": "4.31.0",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.31.0",
-                "@rollup/rollup-linux-riscv64-gnu": "4.31.0",
-                "@rollup/rollup-linux-s390x-gnu": "4.31.0",
-                "@rollup/rollup-linux-x64-gnu": "4.31.0",
-                "@rollup/rollup-linux-x64-musl": "4.31.0",
-                "@rollup/rollup-win32-arm64-msvc": "4.31.0",
-                "@rollup/rollup-win32-ia32-msvc": "4.31.0",
-                "@rollup/rollup-win32-x64-msvc": "4.31.0",
+                "@rollup/rollup-android-arm-eabi": "4.32.1",
+                "@rollup/rollup-android-arm64": "4.32.1",
+                "@rollup/rollup-darwin-arm64": "4.32.1",
+                "@rollup/rollup-darwin-x64": "4.32.1",
+                "@rollup/rollup-freebsd-arm64": "4.32.1",
+                "@rollup/rollup-freebsd-x64": "4.32.1",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.32.1",
+                "@rollup/rollup-linux-arm-musleabihf": "4.32.1",
+                "@rollup/rollup-linux-arm64-gnu": "4.32.1",
+                "@rollup/rollup-linux-arm64-musl": "4.32.1",
+                "@rollup/rollup-linux-loongarch64-gnu": "4.32.1",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.32.1",
+                "@rollup/rollup-linux-riscv64-gnu": "4.32.1",
+                "@rollup/rollup-linux-s390x-gnu": "4.32.1",
+                "@rollup/rollup-linux-x64-gnu": "4.32.1",
+                "@rollup/rollup-linux-x64-musl": "4.32.1",
+                "@rollup/rollup-win32-arm64-msvc": "4.32.1",
+                "@rollup/rollup-win32-ia32-msvc": "4.32.1",
+                "@rollup/rollup-win32-x64-msvc": "4.32.1",
                 "fsevents": "~2.3.2"
             }
         },
@@ -5603,9 +5603,9 @@
             }
         },
         "node_modules/sonner": {
-            "version": "1.7.2",
-            "resolved": "https://registry.npmjs.org/sonner/-/sonner-1.7.2.tgz",
-            "integrity": "sha512-zMbseqjrOzQD1a93lxahm+qMGxWovdMxBlkTbbnZdNqVLt4j+amF9PQxUCL32WfztOFt9t9ADYkejAL3jF9iNA==",
+            "version": "1.7.3",
+            "resolved": "https://registry.npmjs.org/sonner/-/sonner-1.7.3.tgz",
+            "integrity": "sha512-KXLWQfyR6AHpYZuQk8eO8fCbZSJY3JOpgsu/tbGc++jgPjj8JsR1ZpO8vFhqR/OxvWMQCSAmnSShY0gr4FPqHg==",
             "license": "MIT",
             "peerDependencies": {
                 "react": "^18.0.0 || ^19.0.0 || ^19.0.0-rc",
@@ -6038,15 +6038,15 @@
             }
         },
         "node_modules/typescript-eslint": {
-            "version": "8.21.0",
-            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.21.0.tgz",
-            "integrity": "sha512-txEKYY4XMKwPXxNkN8+AxAdX6iIJAPiJbHE/FpQccs/sxw8Lf26kqwC3cn0xkHlW8kEbLhkhCsjWuMveaY9Rxw==",
+            "version": "8.22.0",
+            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.22.0.tgz",
+            "integrity": "sha512-Y2rj210FW1Wb6TWXzQc5+P+EWI9/zdS57hLEc0gnyuvdzWo8+Y8brKlbj0muejonhMI/xAZCnZZwjbIfv1CkOw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/eslint-plugin": "8.21.0",
-                "@typescript-eslint/parser": "8.21.0",
-                "@typescript-eslint/utils": "8.21.0"
+                "@typescript-eslint/eslint-plugin": "8.22.0",
+                "@typescript-eslint/parser": "8.22.0",
+                "@typescript-eslint/utils": "8.22.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
diff --git a/pkgs/by-name/ne/nezha-theme-admin/package.nix b/pkgs/by-name/ne/nezha-theme-admin/package.nix
index 61277ddbdfb5..90084f122a17 100644
--- a/pkgs/by-name/ne/nezha-theme-admin/package.nix
+++ b/pkgs/by-name/ne/nezha-theme-admin/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage rec {
   pname = "nezha-theme-admin";
-  version = "1.6.2";
+  version = "1.6.4";
 
   src = fetchFromGitHub {
     owner = "nezhahq";
     repo = "admin-frontend";
     tag = "v${version}";
-    hash = "sha256-AM3ZHI6oGsvkGg7YmlzLlNlOAAAZYztsRZ9qT/wR2KY=";
+    hash = "sha256-6dWf2vC7zCVx77OdCUd9iYAACZcvkhfQdVSKQp3DGnE=";
   };
 
   # TODO: Switch to the bun build function once available in nixpkgs
@@ -21,7 +21,7 @@ buildNpmPackage rec {
     cp ${./package-lock.json} package-lock.json
   '';
 
-  npmDepsHash = "sha256-qegPPUDlcStdGWMggn9oHSTieWLoNoIJVK0sCx9zMNA=";
+  npmDepsHash = "sha256-8SvD6dycFWk4+PYNNnsbUb3e3H+CTRMwMeWLfx7xppc=";
 
   npmPackFlags = [ "--ignore-scripts" ];
 

From 2af2ea9228fbfe56baae9b958bd80ed67213c81e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Jan 2025 10:27:35 +0000
Subject: [PATCH 72/76] grimblast: 0.1-unstable-2024-12-01 ->
 0.1-unstable-2025-01-29

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

diff --git a/pkgs/by-name/gr/grimblast/package.nix b/pkgs/by-name/gr/grimblast/package.nix
index b01e93c958a5..7252d1a96951 100644
--- a/pkgs/by-name/gr/grimblast/package.nix
+++ b/pkgs/by-name/gr/grimblast/package.nix
@@ -18,13 +18,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "grimblast";
-  version = "0.1-unstable-2024-12-01";
+  version = "0.1-unstable-2025-01-29";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "contrib";
-    rev = "d7c55140f1785b8d9fef351f1cd2a4c9e1eaa466";
-    hash = "sha256-sp14z0mrqrtmouz1+bU4Jh8/0xi+xwQHF2l7mhGSSVU=";
+    rev = "d449f6e1fc31084437ebc0c45057ee656f593efd";
+    hash = "sha256-8ytokHHcKusbspRaiGP38s7fHU105JRvO9GRTzcRklg=";
   };
 
   strictDeps = true;

From 7c831709b2649f325fbb99b2fa750517f09c65fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Jan 2025 10:39:59 +0000
Subject: [PATCH 73/76] remind: 05.02.02 -> 05.02.03

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

diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix
index 1682646ca5e1..35ae4e26e132 100644
--- a/pkgs/by-name/re/remind/package.nix
+++ b/pkgs/by-name/re/remind/package.nix
@@ -16,14 +16,14 @@
 
 tcl.mkTclDerivation rec {
   pname = "remind";
-  version = "05.02.02";
+  version = "05.02.03";
 
   src = fetchFromGitea {
     domain = "git.skoll.ca";
     owner = "Skollsoft-Public";
     repo = "Remind";
     rev = version;
-    hash = "sha256-GLNFj09lZ6iNUp9fuxhpD8wU7tiDIyVVBTye1naZdlM=";
+    hash = "sha256-4OKLBY5OcaUaSsxbOUN1b9LeUqj0rYBWsZNJ70DvcrQ=";
   };
 
   propagatedBuildInputs = lib.optionals withGui [

From da4b0d1e44103598ea5abaa1a3de4a2de216ad7d Mon Sep 17 00:00:00 2001
From: Pedro Alves <pta2002@pta2002.com>
Date: Fri, 24 Jan 2025 14:38:13 +0000
Subject: [PATCH 74/76] qbittorrent-cli: init at v1.8.24285.1

---
 pkgs/by-name/qb/qbittorrent-cli/deps.json   | 902 ++++++++++++++++++++
 pkgs/by-name/qb/qbittorrent-cli/package.nix |  63 ++
 2 files changed, 965 insertions(+)
 create mode 100644 pkgs/by-name/qb/qbittorrent-cli/deps.json
 create mode 100644 pkgs/by-name/qb/qbittorrent-cli/package.nix

diff --git a/pkgs/by-name/qb/qbittorrent-cli/deps.json b/pkgs/by-name/qb/qbittorrent-cli/deps.json
new file mode 100644
index 000000000000..665b616d4a60
--- /dev/null
+++ b/pkgs/by-name/qb/qbittorrent-cli/deps.json
@@ -0,0 +1,902 @@
+[
+  {
+    "pname": "Alba.CsConsoleFormat",
+    "version": "1.0.0",
+    "hash": "sha256-JNCW7F/dqCQ0bS1Z+MBnd2xMfOifJXIcRIeJerQm9WM="
+  },
+  {
+    "pname": "BencodeNET",
+    "version": "2.3.0",
+    "hash": "sha256-U4HxqQhAQ02iRR0GGZQ7gSGFLAsFWwvJg8LqblRvlf4="
+  },
+  {
+    "pname": "CsvHelper",
+    "version": "12.1.2",
+    "hash": "sha256-1J43XjB2CAA2zQRyOry56ukKZaAmH68edyezmAVGXEk="
+  },
+  {
+    "pname": "IPNetwork2",
+    "version": "2.5.235",
+    "hash": "sha256-lY/bBqC4OSS3zKrc6ZN19DOu5JKi5s2ARcvAS3WyLa0="
+  },
+  {
+    "pname": "McMaster.Extensions.CommandLineUtils",
+    "version": "2.4.4",
+    "hash": "sha256-Pzo/Lf1ci+7HviQv1g4dM0Td/v99d2XpNKCwTT2nR6w="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.App.Ref",
+    "version": "3.1.10",
+    "hash": "sha256-51D1XkqFMPHJzOmt1HQ0Bf1n9K0auwEyxTJuqA/8xHY="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.App.Ref",
+    "version": "6.0.36",
+    "hash": "sha256-9jDkWbjw/nd8yqdzVTagCuqr6owJ/DUMi4BlUZT4hWU="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64",
+    "version": "3.1.32",
+    "hash": "sha256-vZkj1OFhojFyl//ZqrbZG3j8rGk/6rwqMhvvR6gWCgI="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.App.Runtime.linux-arm64",
+    "version": "6.0.36",
+    "hash": "sha256-JQULJyF0ivLoUU1JaFfK/HHg+/qzpN7V2RR2Cc+WlQ4="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
+    "version": "3.1.32",
+    "hash": "sha256-OV3Ie8JGTEwNI4Y6DJFh+ZUrBTwrSdFjEbfljfAwn3s="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
+    "version": "6.0.36",
+    "hash": "sha256-zUsVIpV481vMLAXaLEEUpEMA9/f1HGOnvaQnaWdzlyY="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.App.Runtime.osx-arm64",
+    "version": "6.0.36",
+    "hash": "sha256-2seqZcz0JeUjkzh3QcGa9TcJ4LUafpFjTRk+Nm8T6T0="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64",
+    "version": "3.1.32",
+    "hash": "sha256-LD7skhj3ZqIJlgL2VG/1PqPJT7yGQPuSNkduHhQpM7M="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.App.Runtime.osx-x64",
+    "version": "6.0.36",
+    "hash": "sha256-yxLafxiBKkvfkDggPk0P9YZIHBkDJOsFTO7/V9mEHuU="
+  },
+  {
+    "pname": "Microsoft.CSharp",
+    "version": "4.3.0",
+    "hash": "sha256-a3dAiPaVuky0wpcHmpTVtAQJNGZ2v91/oArA+dpJgj8="
+  },
+  {
+    "pname": "Microsoft.CSharp",
+    "version": "4.4.0",
+    "hash": "sha256-EMIApW3Zj0V85leF7DLgFFvfqPdsIdvvJ3BD7zD+Pto="
+  },
+  {
+    "pname": "Microsoft.NETCore.App",
+    "version": "2.1.30",
+    "hash": "sha256-DucpZ4+YQ0g7GMOcEjsNJj2Ol1jynqEyUZwpzY7keYE="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Host.linux-arm64",
+    "version": "3.1.32",
+    "hash": "sha256-V5yVTC2je2wsv/gqLaVmnzcnDfNGETz0e7/M3MG5z/8="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Host.linux-arm64",
+    "version": "6.0.36",
+    "hash": "sha256-9lC/LYnthYhjkWWz2kkFCvlA5LJOv11jdt59SDnpdy0="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Host.linux-x64",
+    "version": "3.1.32",
+    "hash": "sha256-ajR6pZv0zuzWDyxEnWtAuhasV5biV5lvweEbefTISiM="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Host.linux-x64",
+    "version": "6.0.36",
+    "hash": "sha256-VFRDzx7LJuvI5yzKdGmw/31NYVbwHWPKQvueQt5xc10="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Host.osx-arm64",
+    "version": "6.0.36",
+    "hash": "sha256-DaSWwYACJGolEBuMhzDVCj/rQTdDt061xCVi+gyQnuo="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Host.osx-x64",
+    "version": "3.1.32",
+    "hash": "sha256-AOr3qBlvr+WGF79tTq/yvKWJLXqEO4Sv+eTCpZGVz6A="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Host.osx-x64",
+    "version": "6.0.36",
+    "hash": "sha256-FrRny9EI6HKCKQbu6mcLj5w4ooSRrODD4Vj2ZMGnMd4="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Ref",
+    "version": "3.1.0",
+    "hash": "sha256-nuAvHwmJ2s3Ob1qNDH1+uV3awOZaWlaV3FenTmPUWyM="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Ref",
+    "version": "6.0.36",
+    "hash": "sha256-9LZgVoIFF8qNyUu8kdJrYGLutMF/cL2K82HN2ywwlx8="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Runtime.linux-arm64",
+    "version": "3.1.32",
+    "hash": "sha256-eL+GH7cDWSzXPPN9yxQvQ6IQ3AFUfnH0OJ/r8Mmx7I4="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Runtime.linux-arm64",
+    "version": "6.0.36",
+    "hash": "sha256-k3rxvUhCEU0pVH8KgEMtkPiSOibn+nBh+0zT2xIfId8="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Runtime.linux-x64",
+    "version": "3.1.32",
+    "hash": "sha256-h4HjfRnvH81dW84S3TCPcCfxeQLiLN7b1ZleRNsprFY="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Runtime.linux-x64",
+    "version": "6.0.36",
+    "hash": "sha256-U8wJ2snSDFqeAgDVLXjnniidC7Cr5aJ1/h/BMSlyu0c="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Runtime.osx-arm64",
+    "version": "6.0.36",
+    "hash": "sha256-UfLcrL2Gj/OLz0s92Oo+OCJeDpZFAcQLPLiSNND8D5Y="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Runtime.osx-x64",
+    "version": "3.1.32",
+    "hash": "sha256-IcJ45kU65HpYu1EjMB1sf87PTSvPdS2h5uyIzX4acxk="
+  },
+  {
+    "pname": "Microsoft.NETCore.App.Runtime.osx-x64",
+    "version": "6.0.36",
+    "hash": "sha256-0xIJYFzxdMcnCj3wzkFRQZSnQcPHzPHMzePRIOA3oJs="
+  },
+  {
+    "pname": "Microsoft.NETCore.DotNetAppHost",
+    "version": "2.1.30",
+    "hash": "sha256-S32dRd5Qw5P/Srjaz849B0P8hcG02ZzmJcDY0GLdS2U="
+  },
+  {
+    "pname": "Microsoft.NETCore.DotNetHostPolicy",
+    "version": "2.1.30",
+    "hash": "sha256-/G5C9pmkaM1ReoMTD7QNUsm+oHkjZrK9qHdrTZVUZv4="
+  },
+  {
+    "pname": "Microsoft.NETCore.DotNetHostResolver",
+    "version": "2.1.30",
+    "hash": "sha256-5gx6yqwbWsWWKOmldsLnN5o8fXQf2rbSUknSEhs1c0w="
+  },
+  {
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "1.1.0",
+    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
+  },
+  {
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "2.1.14",
+    "hash": "sha256-eDbkdKujlhWqhcbembwpyM4DKrROdhJVB74YP/VjdVU="
+  },
+  {
+    "pname": "Microsoft.NETCore.Targets",
+    "version": "1.1.0",
+    "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
+  },
+  {
+    "pname": "Microsoft.NETCore.Targets",
+    "version": "2.0.0",
+    "hash": "sha256-Qk2PbbhZpPzb88JiQQcXlNK6RDBfP1of6g337RTMWVs="
+  },
+  {
+    "pname": "Microsoft.NETFramework.ReferenceAssemblies",
+    "version": "1.0.3",
+    "hash": "sha256-FBoJP5DHZF0QHM0xLm9yd4HJZVQOuSpSKA+VQRpphEE="
+  },
+  {
+    "pname": "Microsoft.NETFramework.ReferenceAssemblies.net46",
+    "version": "1.0.3",
+    "hash": "sha256-3Lt5uzho2/u2TGQxFvqmPYiO6ezLoMTpZemZLtfE410="
+  },
+  {
+    "pname": "Microsoft.Win32.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="
+  },
+  {
+    "pname": "Mono.Posix",
+    "version": "5.4.0.201",
+    "hash": "sha256-5UyoA2LFenAuqzHwf7Kc4I/OXEeYsvVdMx1wFEfGLas="
+  },
+  {
+    "pname": "Mono.Posix.NETStandard",
+    "version": "1.0.0",
+    "hash": "sha256-/F61k7MY/fu2FcfW7CkyjuUroKwlYAXPQFVeDs1QknY="
+  },
+  {
+    "pname": "NETStandard.Library",
+    "version": "1.6.1",
+    "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="
+  },
+  {
+    "pname": "NETStandard.Library",
+    "version": "2.0.3",
+    "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
+  },
+  {
+    "pname": "Newtonsoft.Json",
+    "version": "13.0.3",
+    "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
+  },
+  {
+    "pname": "NJsonSchema",
+    "version": "9.14.1",
+    "hash": "sha256-dL+eEevnkY9zP3gDb+XGTISbXPkSn1QCz3TlZS+n2WQ="
+  },
+  {
+    "pname": "Portable.BouncyCastle",
+    "version": "1.8.8",
+    "hash": "sha256-Ikeur99EVv8T3UrPTmSX59ScPCoYYo5e/tjteEAB7qk="
+  },
+  {
+    "pname": "Portable.Xaml",
+    "version": "0.18.0",
+    "hash": "sha256-1Yl7X9RgmuO/roFvjhocCZxVxIdtvjzLuPKodNiSl3s="
+  },
+  {
+    "pname": "QBittorrent.Client",
+    "version": "1.9.24285.1",
+    "hash": "sha256-Jt8jHPU/0AoE7sugvNTHfQUVEtPwv1jQgckDmD2Tv7E="
+  },
+  {
+    "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",
+    "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="
+  },
+  {
+    "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="
+  },
+  {
+    "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="
+  },
+  {
+    "pname": "runtime.linux-arm64.Microsoft.NETCore.App",
+    "version": "2.1.30",
+    "hash": "sha256-0kRKwOZr5ZAoYRlSSntAZkvbG9jjIosteg79KggjOQ0="
+  },
+  {
+    "pname": "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost",
+    "version": "2.1.30",
+    "hash": "sha256-gdd3w8hQ4gg+wHx0p5dc9LS+Vw1GhNa0JKfsLQ8a9QI="
+  },
+  {
+    "pname": "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy",
+    "version": "2.1.30",
+    "hash": "sha256-3FHYUUXakKScAxdfO9U4SQPAdslGewAeRaSntzvRUr4="
+  },
+  {
+    "pname": "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver",
+    "version": "2.1.30",
+    "hash": "sha256-a8bVHitAuYoDFlBZQ5oaQR9xTTiubQTko/TplHni30s="
+  },
+  {
+    "pname": "runtime.linux-x64.Microsoft.NETCore.App",
+    "version": "2.1.30",
+    "hash": "sha256-C68Sv04pdUcOcZunGCv9BD6sC+80U3Iv3FsZyZ+ayfM="
+  },
+  {
+    "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost",
+    "version": "2.1.30",
+    "hash": "sha256-/VWZBxBvHI8n5so2GU6Eo3Jzj4lVk+ouIH0sbyrcNFc="
+  },
+  {
+    "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy",
+    "version": "2.1.30",
+    "hash": "sha256-gaUvRbpiC8ApcwC4FA0F4G8fmvp4xDL6FrnpizmKaf8="
+  },
+  {
+    "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver",
+    "version": "2.1.30",
+    "hash": "sha256-Je0Ov7Mhqe6zH7+WTkbRkIbXbp/NefQ30xeYd6Ho3+g="
+  },
+  {
+    "pname": "runtime.native.System",
+    "version": "4.3.0",
+    "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
+  },
+  {
+    "pname": "runtime.native.System.IO.Compression",
+    "version": "4.3.0",
+    "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="
+  },
+  {
+    "pname": "runtime.native.System.Net.Http",
+    "version": "4.3.0",
+    "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="
+  },
+  {
+    "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",
+    "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="
+  },
+  {
+    "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="
+  },
+  {
+    "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="
+  },
+  {
+    "pname": "runtime.osx-x64.Microsoft.NETCore.App",
+    "version": "2.1.30",
+    "hash": "sha256-1LfaR0V2Jl7S150BVSimd4vOkDdfecyRET3Bazq3/eI="
+  },
+  {
+    "pname": "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost",
+    "version": "2.1.30",
+    "hash": "sha256-t6npxXEpJFBAwHjbSrkG9uEMg5O0nsjaMaMzVpHLYvc="
+  },
+  {
+    "pname": "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy",
+    "version": "2.1.30",
+    "hash": "sha256-dJMmh92qa+ZlUCunxjlIT5uMYfE9PiegBvXHHQllVCM="
+  },
+  {
+    "pname": "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver",
+    "version": "2.1.30",
+    "hash": "sha256-YZ0ZPZgLmqIN/UbIrDjyFwMiuTwg/4CeZaoiOwFUxJc="
+  },
+  {
+    "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",
+    "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="
+  },
+  {
+    "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="
+  },
+  {
+    "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="
+  },
+  {
+    "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="
+  },
+  {
+    "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "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": "System.AppContext",
+    "version": "4.3.0",
+    "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="
+  },
+  {
+    "pname": "System.Buffers",
+    "version": "4.3.0",
+    "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="
+  },
+  {
+    "pname": "System.Buffers",
+    "version": "4.5.1",
+    "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
+  },
+  {
+    "pname": "System.Collections",
+    "version": "4.3.0",
+    "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="
+  },
+  {
+    "pname": "System.Collections.Concurrent",
+    "version": "4.3.0",
+    "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="
+  },
+  {
+    "pname": "System.Collections.NonGeneric",
+    "version": "4.3.0",
+    "hash": "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8="
+  },
+  {
+    "pname": "System.Collections.Specialized",
+    "version": "4.3.0",
+    "hash": "sha256-QNg0JJNx+zXMQ26MJRPzH7THdtqjrNtGLUgaR1SdvOk="
+  },
+  {
+    "pname": "System.ComponentModel",
+    "version": "4.3.0",
+    "hash": "sha256-i00uujMO4JEDIEPKLmdLY3QJ6vdSpw6Gh9oOzkFYBiU="
+  },
+  {
+    "pname": "System.ComponentModel.Annotations",
+    "version": "4.4.1",
+    "hash": "sha256-8NZ0tWPqRYf3ovkn4OQapGsHeseEYKg91nqZAU33hrQ="
+  },
+  {
+    "pname": "System.ComponentModel.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-IOMJleuIBppmP4ECB3uftbdcgL7CCd56+oAD/Sqrbus="
+  },
+  {
+    "pname": "System.ComponentModel.TypeConverter",
+    "version": "4.3.0",
+    "hash": "sha256-PSDiPYt8PgTdTUBz+GH6lHCaM1YgfObneHnZsc8Fz54="
+  },
+  {
+    "pname": "System.Console",
+    "version": "4.3.0",
+    "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="
+  },
+  {
+    "pname": "System.Diagnostics.Debug",
+    "version": "4.3.0",
+    "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="
+  },
+  {
+    "pname": "System.Diagnostics.DiagnosticSource",
+    "version": "4.3.0",
+    "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="
+  },
+  {
+    "pname": "System.Diagnostics.Tools",
+    "version": "4.3.0",
+    "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="
+  },
+  {
+    "pname": "System.Diagnostics.Tracing",
+    "version": "4.3.0",
+    "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="
+  },
+  {
+    "pname": "System.Dynamic.Runtime",
+    "version": "4.3.0",
+    "hash": "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="
+  },
+  {
+    "pname": "System.Globalization",
+    "version": "4.3.0",
+    "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="
+  },
+  {
+    "pname": "System.Globalization.Calendars",
+    "version": "4.3.0",
+    "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="
+  },
+  {
+    "pname": "System.Globalization.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="
+  },
+  {
+    "pname": "System.IO",
+    "version": "4.3.0",
+    "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="
+  },
+  {
+    "pname": "System.IO.Compression",
+    "version": "4.3.0",
+    "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="
+  },
+  {
+    "pname": "System.IO.Compression.ZipFile",
+    "version": "4.3.0",
+    "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="
+  },
+  {
+    "pname": "System.IO.FileSystem",
+    "version": "4.3.0",
+    "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="
+  },
+  {
+    "pname": "System.IO.FileSystem.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="
+  },
+  {
+    "pname": "System.Linq",
+    "version": "4.3.0",
+    "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="
+  },
+  {
+    "pname": "System.Linq.Expressions",
+    "version": "4.3.0",
+    "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="
+  },
+  {
+    "pname": "System.Memory",
+    "version": "4.5.5",
+    "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
+  },
+  {
+    "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.3.0",
+    "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="
+  },
+  {
+    "pname": "System.Net.Sockets",
+    "version": "4.3.0",
+    "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="
+  },
+  {
+    "pname": "System.ObjectModel",
+    "version": "4.3.0",
+    "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="
+  },
+  {
+    "pname": "System.Private.Uri",
+    "version": "4.3.0",
+    "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
+  },
+  {
+    "pname": "System.Reflection",
+    "version": "4.3.0",
+    "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
+  },
+  {
+    "pname": "System.Reflection.Emit",
+    "version": "4.3.0",
+    "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="
+  },
+  {
+    "pname": "System.Reflection.Emit.ILGeneration",
+    "version": "4.3.0",
+    "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
+  },
+  {
+    "pname": "System.Reflection.Emit.Lightweight",
+    "version": "4.3.0",
+    "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
+  },
+  {
+    "pname": "System.Reflection.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="
+  },
+  {
+    "pname": "System.Reflection.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
+  },
+  {
+    "pname": "System.Reflection.TypeExtensions",
+    "version": "4.3.0",
+    "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="
+  },
+  {
+    "pname": "System.Reflection.TypeExtensions",
+    "version": "4.4.0",
+    "hash": "sha256-sGgfV4pG9Kr+PLAR/DyRGiTP09Tkvol9U/WLSwkPOVk="
+  },
+  {
+    "pname": "System.Resources.ResourceManager",
+    "version": "4.3.0",
+    "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="
+  },
+  {
+    "pname": "System.Runtime",
+    "version": "4.3.0",
+    "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
+  },
+  {
+    "pname": "System.Runtime.CompilerServices.Unsafe",
+    "version": "4.5.3",
+    "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="
+  },
+  {
+    "pname": "System.Runtime.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
+  },
+  {
+    "pname": "System.Runtime.Handles",
+    "version": "4.3.0",
+    "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="
+  },
+  {
+    "pname": "System.Runtime.InteropServices",
+    "version": "4.3.0",
+    "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="
+  },
+  {
+    "pname": "System.Runtime.InteropServices.RuntimeInformation",
+    "version": "4.3.0",
+    "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="
+  },
+  {
+    "pname": "System.Runtime.Numerics",
+    "version": "4.3.0",
+    "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="
+  },
+  {
+    "pname": "System.Runtime.Serialization.Primitives",
+    "version": "4.3.0",
+    "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",
+    "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="
+  },
+  {
+    "pname": "System.Security.Cryptography.Cng",
+    "version": "4.3.0",
+    "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="
+  },
+  {
+    "pname": "System.Security.Cryptography.Csp",
+    "version": "4.3.0",
+    "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="
+  },
+  {
+    "pname": "System.Security.Cryptography.Encoding",
+    "version": "4.3.0",
+    "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="
+  },
+  {
+    "pname": "System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="
+  },
+  {
+    "pname": "System.Security.Cryptography.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="
+  },
+  {
+    "pname": "System.Security.Cryptography.ProtectedData",
+    "version": "5.0.0",
+    "hash": "sha256-K3TEOJ93azzLMiitzYdhJHrBfRvqoUa5bl44VSTLAUs="
+  },
+  {
+    "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.Text.Encoding",
+    "version": "4.3.0",
+    "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="
+  },
+  {
+    "pname": "System.Text.Encoding.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="
+  },
+  {
+    "pname": "System.Text.RegularExpressions",
+    "version": "4.3.0",
+    "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="
+  },
+  {
+    "pname": "System.Threading",
+    "version": "4.3.0",
+    "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="
+  },
+  {
+    "pname": "System.Threading.Tasks",
+    "version": "4.3.0",
+    "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
+  },
+  {
+    "pname": "System.Threading.Tasks.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="
+  },
+  {
+    "pname": "System.Threading.ThreadPool",
+    "version": "4.3.0",
+    "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="
+  },
+  {
+    "pname": "System.Threading.Timer",
+    "version": "4.3.0",
+    "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="
+  },
+  {
+    "pname": "System.ValueTuple",
+    "version": "4.4.0",
+    "hash": "sha256-LqpI3bSaXqVPqfEdfsWE2qX9tzFV6VPU6x4A/fVzzfM="
+  },
+  {
+    "pname": "System.ValueTuple",
+    "version": "4.5.0",
+    "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="
+  },
+  {
+    "pname": "System.Xml.ReaderWriter",
+    "version": "4.3.0",
+    "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="
+  },
+  {
+    "pname": "System.Xml.XDocument",
+    "version": "4.3.0",
+    "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="
+  },
+  {
+    "pname": "System.Xml.XmlDocument",
+    "version": "4.3.0",
+    "hash": "sha256-kbuV4Y7rVJkfMp2Kgoi8Zvdatm9CZNmlKB3GZgANvy4="
+  }
+]
diff --git a/pkgs/by-name/qb/qbittorrent-cli/package.nix b/pkgs/by-name/qb/qbittorrent-cli/package.nix
new file mode 100644
index 000000000000..40d3dac0e71f
--- /dev/null
+++ b/pkgs/by-name/qb/qbittorrent-cli/package.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  buildDotnetModule,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+}:
+let
+  version = "1.8.24285.1";
+in
+buildDotnetModule {
+  pname = "qbittorrent-cli";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "fedarovich";
+    repo = "qbittorrent-cli";
+    tag = "v${version}";
+    hash = "sha256-ZGK8nicaXlDIShACeF4QS0BOCZCN0T4JFtHuuFoXhBw=";
+  };
+
+  nugetDeps = ./deps.json;
+  dotnetBuildFlags = [
+    "-f"
+    "net6"
+  ];
+  dotnetInstallFlags = [
+    "-f"
+    "net6"
+  ];
+  selfContainedBuild = true;
+
+  projectFile = "src/QBittorrent.CommandLineInterface/QBittorrent.CommandLineInterface.csproj";
+  executables = [ "qbt" ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  versionCheckProgram = "${placeholder "out"}/bin/qbt";
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Command line interface for qBittorrent";
+    homepage = "https://github.com/fedarovich/qbittorrent-cli";
+    changelog = "https://github.com/fedarovich/qbittorrent-cli/releases/tag/v${version}";
+    license = with lib.licenses; [
+      mit
+    ];
+    platforms = lib.platforms.unix;
+    badPlatforms = [
+      # error NETSDK1084: There is no application host available for the specified RuntimeIdentifier 'osx-arm64'
+      "aarch64-darwin"
+    ];
+    maintainers = with lib.maintainers; [
+      pta2002
+    ];
+    mainProgram = "qbt";
+  };
+}

From 3571dc0df082949e9576fc11e028ba7fb98050eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Jan 2025 11:00:48 +0000
Subject: [PATCH 75/76] hyprlandPlugins.hyprsplit: 0.46.2 -> 0.47.0

---
 .../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 513f5504ab8e..ff9a24a9aefd 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.2";
+  version = "0.47.0";
 
   src = fetchFromGitHub {
     owner = "shezdy";
     repo = "hyprsplit";
     rev = "refs/tags/v${version}";
-    hash = "sha256-G+fgzjGNkYl5y6XL9K67ixCPEhb02J45cS9uicdC110=";
+    hash = "sha256-IKcUv2ayfiEoF9mOkt/+ACTSVI0RW/tCA9BS64/qePE=";
   };
 
   nativeBuildInputs = [

From 407c45fccb8cd509106e4f8ecc73c8d2550fa615 Mon Sep 17 00:00:00 2001
From: Isidor Zeuner <nix@quidecco.pl>
Date: Thu, 30 Jan 2025 12:23:40 +0100
Subject: [PATCH 76/76] python312Packages.torch: update git submodule unroller

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

diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix
index 26c1e15207a5..e43e28fe42a4 100644
--- a/pkgs/development/python-modules/torch/default.nix
+++ b/pkgs/development/python-modules/torch/default.nix
@@ -232,8 +232,8 @@ let
     domain = "codeberg.org";
     owner = "gm6k";
     repo = "git-unroll";
-    rev = "96bf24f2af153310ec59979c123a8cefda8636db";
-    hash = "sha256-BTlq2Pm4l/oypBzKKpxExVPyQ0CcAP8llUnl/fd3DUU=";
+    rev = "9243bb8a6a9f6875e21a5c64320b66f7fdaf9b3f";
+    hash = "sha256-1MjbB1EVgmU0HlUibrKOkjmxQ8wseocSJENiAqyHcjU=";
   };
 
   unroll-src = writeShellScript "unroll-src" ''