From 1e168a68713126d569ef48914b59d592cd6d0a4e Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Thu, 2 Jan 2025 15:32:12 +0100
Subject: [PATCH 01/60] python312Packages.shiboken2: fix strictDeps build

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

diff --git a/pkgs/development/python-modules/shiboken2/default.nix b/pkgs/development/python-modules/shiboken2/default.nix
index 88f59fc86ebb..14ab87dd56b8 100644
--- a/pkgs/development/python-modules/shiboken2/default.nix
+++ b/pkgs/development/python-modules/shiboken2/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation {
         setuptools
       ]
     ))
+    qt5.qmake
   ];
 
   buildInputs =

From 8088349c28a2a9396a3653d4519734e7bae3c4dc Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 13 Feb 2025 23:26:31 +0100
Subject: [PATCH 02/60] python313Packages.trimesh: 4.6.1 -> 4.6.2

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

diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix
index a1ff069ce3fe..22b53464b9dd 100644
--- a/pkgs/development/python-modules/trimesh/default.nix
+++ b/pkgs/development/python-modules/trimesh/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "trimesh";
-  version = "4.6.1";
+  version = "4.6.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-/uoiGFhKZnEzinDryUMwpoxZwSggV0ZPd9kqgB1vQPI=";
+    hash = "sha256-z7mWi1libCZhLqXK2sBV2X0Rkkf0YNdbM/T3gRd4VdY=";
   };
 
   build-system = [ setuptools ];

From 01137327f6ca517b1a4cff8b93b0b9397e4c56f7 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sat, 8 Feb 2025 20:49:17 +0100
Subject: [PATCH 03/60] mokuro: 0.2.1 -> 0.2.2

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

diff --git a/pkgs/by-name/mo/mokuro/package.nix b/pkgs/by-name/mo/mokuro/package.nix
index d1b14f45c289..139f1ad7e06f 100644
--- a/pkgs/by-name/mo/mokuro/package.nix
+++ b/pkgs/by-name/mo/mokuro/package.nix
@@ -6,19 +6,17 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "mokuro";
-  version = "0.2.1";
+  version = "0.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kha-white";
     repo = "mokuro";
-    rev = "v${version}";
-    hash = "sha256-+hcc3spbpktavqJ8q4kuQFpkm0PYIru6UdpkU7L8XI4=";
+    tag = "v${version}";
+    hash = "sha256-cdbkculYPPWCSqBufpgt4EU3ne6KU2Dxk0xsvkdMZHA=";
     fetchSubmodules = true;
   };
 
-  pythonRelaxDeps = [ "torchvision" ];
-
   build-system = with python3Packages; [ setuptools-scm ];
 
   dependencies = with python3Packages; [
@@ -45,6 +43,7 @@ python3Packages.buildPythonApplication rec {
   doCheck = false;
 
   meta = {
+    changelog = "https://github.com/kha-white/mokuro/releases/tag/v${version}";
     description = "Read Japanese manga inside browser with selectable text";
     homepage = "https://github.com/kha-white/mokuro";
     license = lib.licenses.gpl3Only;

From 27c658d7a9263d387d80a4b568f09a63d3b3c6be Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 14 Feb 2025 11:09:49 +0100
Subject: [PATCH 04/60] python313Packagea.trimesh: modernize

---
 .../python-modules/trimesh/default.nix           | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix
index 22b53464b9dd..7d8db0b0ad66 100644
--- a/pkgs/development/python-modules/trimesh/default.nix
+++ b/pkgs/development/python-modules/trimesh/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   setuptools,
   pytestCheckHook,
   pythonOlder,
@@ -16,9 +16,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-z7mWi1libCZhLqXK2sBV2X0Rkkf0YNdbM/T3gRd4VdY=";
+  src = fetchFromGitHub {
+    owner = "mikedh";
+    repo = "trimesh";
+    tag = version;
+    hash = "sha256-ttOawg1mdGkV1Pi0CmFR4VtmZ9MUxPed0KoXLwlbUPE=";
   };
 
   build-system = [ setuptools ];
@@ -39,13 +41,13 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "trimesh" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python library for loading and using triangular meshes";
     homepage = "https://trimesh.org/";
     changelog = "https://github.com/mikedh/trimesh/releases/tag/${version}";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     mainProgram = "trimesh";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       gebner
       pbsds
     ];

From 6b401fa83fae7cc67b4c28b98a1ec17c3b5da0a5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 14 Feb 2025 13:21:39 +0000
Subject: [PATCH 05/60] jmol: 16.3.7 -> 16.3.9

---
 pkgs/applications/science/chemistry/jmol/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
index c7f0403cf90a..d588497b8343 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -25,14 +25,14 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  version = "16.3.7";
+  version = "16.3.9";
   pname = "jmol";
 
   src = let
     baseVersion = "${lib.versions.major version}.${lib.versions.minor version}";
   in fetchurl {
     url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz";
-    hash = "sha256-SQuIjwafPipQy9C2yJQ2CIFV/lSAnHkp1jYnPK1BWcQ=";
+    hash = "sha256-+Eh5484tW/U/YJb7sMf6W/QrsBz5j/aTrW4vnJobwiY=";
   };
 
   patchPhase = ''

From 4020fda8d21d624298fc9a3f2ef36b43724a2dcf Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Sat, 15 Feb 2025 18:40:54 +0800
Subject: [PATCH 06/60] argo-workflows: rename from argo to align with upstream

---
 pkgs/by-name/ar/{argo => argo-workflows}/package.nix        | 2 +-
 pkgs/by-name/ar/{argo => argo-workflows}/staticfiles.go.mod | 0
 pkgs/top-level/aliases.nix                                  | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)
 rename pkgs/by-name/ar/{argo => argo-workflows}/package.nix (98%)
 rename pkgs/by-name/ar/{argo => argo-workflows}/staticfiles.go.mod (100%)

diff --git a/pkgs/by-name/ar/argo/package.nix b/pkgs/by-name/ar/argo-workflows/package.nix
similarity index 98%
rename from pkgs/by-name/ar/argo/package.nix
rename to pkgs/by-name/ar/argo-workflows/package.nix
index f4a8825b9554..c74969733c71 100644
--- a/pkgs/by-name/ar/argo/package.nix
+++ b/pkgs/by-name/ar/argo-workflows/package.nix
@@ -33,7 +33,7 @@ let
   };
 in
 buildGoModule rec {
-  pname = "argo";
+  pname = "argo-workflows";
   version = "3.6.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/ar/argo/staticfiles.go.mod b/pkgs/by-name/ar/argo-workflows/staticfiles.go.mod
similarity index 100%
rename from pkgs/by-name/ar/argo/staticfiles.go.mod
rename to pkgs/by-name/ar/argo-workflows/staticfiles.go.mod
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c5cb1be5ddf5..9bb4ecc61dbb 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -121,6 +121,7 @@ mapAliases {
   apple-sdk_10_15 = throw "apple-sdk_10_15 was removed as Nixpkgs no longer supports macOS 10.15; see the 25.05 release notes"; # Added 2024-10-27
   appthreat-depscan = dep-scan; # Added 2024-04-10
   arcanist = throw "arcanist was removed as phabricator is not supported and does not accept fixes"; # Added 2024-06-07
+  argo = argo-workflows; # Added 2025-02-01
   aria = aria2; # Added 2024-03-26
   armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11
   aseprite-unfree = aseprite; # Added 2023-08-26

From 144c05d42f8dffdda488b39cc97973a88ded847d Mon Sep 17 00:00:00 2001
From: Zhong Jianxin <azuwis@gmail.com>
Date: Sun, 16 Feb 2025 19:13:06 +0800
Subject: [PATCH 07/60] home-assistant-custom-components.xiaomi_miot: Ignore
 pre-release for nix-update

---
 .../home-assistant/custom-components/xiaomi_miot/package.nix    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
index 58a5fae706d7..0f3c2f4b34c0 100644
--- a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
@@ -28,7 +28,7 @@ buildHomeAssistantComponent rec {
 
   dontBuild = true;
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=^v([0-9.]+)$" ]; };
 
   meta = {
     changelog = "https://github.com/al-one/hass-xiaomi-miot/releases/tag/v${version}";

From 6283195b167b09da37df6c5e135e73751f54d979 Mon Sep 17 00:00:00 2001
From: Zhong Jianxin <azuwis@gmail.com>
Date: Sun, 16 Feb 2025 19:24:45 +0800
Subject: [PATCH 08/60] home-assistant-custom-components.xiaomi_miot: 1.0.8 ->
 1.0.9

---
 .../home-assistant/custom-components/xiaomi_miot/package.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
index 0f3c2f4b34c0..9a697ad651b0 100644
--- a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
@@ -11,13 +11,13 @@
 buildHomeAssistantComponent rec {
   owner = "al-one";
   domain = "xiaomi_miot";
-  version = "1.0.8";
+  version = "1.0.9";
 
   src = fetchFromGitHub {
     owner = "al-one";
     repo = "hass-xiaomi-miot";
     rev = "v${version}";
-    hash = "sha256-DTIXhs5gPN96C/fWz3s7ZTOybp7Mx+/NbNGXIOGyMmk=";
+    hash = "sha256-2XCm7XEKQgoe8myAgPnYCOO+XdLTAl8NtAVCBMJGqDc=";
   };
 
   dependencies = [

From 7ac5805540100164581775b998660d1d210eaba3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 16 Feb 2025 16:10:42 +0000
Subject: [PATCH 09/60] storj-uplink: 1.121.3 -> 1.122.2

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

diff --git a/pkgs/by-name/st/storj-uplink/package.nix b/pkgs/by-name/st/storj-uplink/package.nix
index 87c5de138da8..3ef80cb20c73 100644
--- a/pkgs/by-name/st/storj-uplink/package.nix
+++ b/pkgs/by-name/st/storj-uplink/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "storj-uplink";
-  version = "1.121.3";
+  version = "1.122.2";
 
   src = fetchFromGitHub {
     owner = "storj";
     repo = "storj";
     rev = "v${version}";
-    hash = "sha256-Q/iQUgXeYvGDBuVL8hhHU7SK+sNVQtXCDBoRYFO+N9Y=";
+    hash = "sha256-PO5if8fBbWkLSEFuRues/B4+yWo6I4TNH25SybGU1Rg=";
   };
 
   subPackages = [ "cmd/uplink" ];
 
-  vendorHash = "sha256-XgHTzE982POxbCzlfSt05y+h8DJb/3fiFV5l/Fu8vGg=";
+  vendorHash = "sha256-mISSkuBU0E/ss5hLq5S4luStqJ/r9Vy1VVe5hMLehSc=";
 
   ldflags = [
     "-s"

From c55a420857802a81b84b62e6f1d8e3f4aa5de751 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Mon, 17 Feb 2025 12:33:45 +0100
Subject: [PATCH 10/60] cinny: 4.3.0 -> 4.3.2

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

diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix
index 9978f08c32ab..a033fb364593 100644
--- a/pkgs/by-name/ci/cinny-unwrapped/package.nix
+++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix
@@ -13,16 +13,16 @@
 
 buildNpmPackage rec {
   pname = "cinny-unwrapped";
-  version = "4.3.0";
+  version = "4.3.2";
 
   src = fetchFromGitHub {
     owner = "cinnyapp";
     repo = "cinny";
     rev = "v${version}";
-    hash = "sha256-cRsjzIq8uFipyYYmxK4JzmG3Ba/0NaScyiebGqoZJFE=";
+    hash = "sha256-PXh3ouPPgSm4BFq6lE4vr2L+Eu7rsANvhXzqYY0rpVw=";
   };
 
-  npmDepsHash = "sha256-ZmeXZN9sW17y4aIeIthvs4YiFF77xabeVXGwr6O49lQ=";
+  npmDepsHash = "sha256-Ktz82HzbWeMvx5McWS11qpqWNVWJU6yxIFzUkMoT6WE=";
 
   nativeBuildInputs = [
     python3

From a63e1561d9c0075f45f27647f8db59d20cd25bb3 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Mon, 17 Feb 2025 12:36:46 +0100
Subject: [PATCH 11/60] cinny-desktop: 4.3.1 -> 4.3.2

---
 pkgs/by-name/ci/cinny-desktop/package.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix
index e11bf85c123d..39b03424d322 100644
--- a/pkgs/by-name/ci/cinny-desktop/package.nix
+++ b/pkgs/by-name/ci/cinny-desktop/package.nix
@@ -19,28 +19,26 @@
 rustPlatform.buildRustPackage rec {
   pname = "cinny-desktop";
   # We have to be using the same version as cinny-web or this isn't going to work.
-  # TODO: this is temporarily not true for Cinny Desktop v4.3.1
-  version = "4.3.1";
+  version = "4.3.2";
 
   src = fetchFromGitHub {
     owner = "cinnyapp";
     repo = "cinny-desktop";
     tag = "v${version}";
-    hash = "sha256-lVBKzajxsQ33zC6NhRLMbWK81GxCbIQPtSR61yJHUL4=";
+    hash = "sha256-GwLfeQG19s35sEfeZmWa+PkJtAcSUHcbe05KnJ+jttY=";
   };
 
   sourceRoot = "${src.name}/src-tauri";
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-a2IyJ5a11cxgHpb2WRDxVF+aoL8kNnjBNwaQpgT3goo=";
+  cargoHash = "sha256-cX6nVNdSpy1Kbccuiv0XG+MysCjrLem42osTvhn2aMA=";
 
   postPatch =
     let
       cinny' =
-        # TODO: temporarily disabled for Cinny Desktop v4.3.1 (cinny-unwrapped is still at 4.3.0)
-        # assert lib.assertMsg (
-        #   cinny.version == version
-        # ) "cinny.version (${cinny.version}) != cinny-desktop.version (${version})";
+        assert lib.assertMsg (
+          cinny.version == version
+        ) "cinny.version (${cinny.version}) != cinny-desktop.version (${version})";
         cinny.override {
           conf = {
             hashRouter.enabled = true;

From 6dfdfc9c3a7a5e5f98ec6c4379ed89c02517c916 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 17 Feb 2025 21:37:49 +0100
Subject: [PATCH 12/60] php84Extensions.pcov: 1.0.11 -> 1.0.12

---
 pkgs/development/php-packages/pcov/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/php-packages/pcov/default.nix b/pkgs/development/php-packages/pcov/default.nix
index 02af71c12e6e..1b990d02fd9e 100644
--- a/pkgs/development/php-packages/pcov/default.nix
+++ b/pkgs/development/php-packages/pcov/default.nix
@@ -1,14 +1,13 @@
 {
   buildPecl,
   lib,
-  php,
   pcre2,
   fetchFromGitHub,
   fetchpatch,
 }:
 
 let
-  version = "1.0.11";
+  version = "1.0.12";
 in
 buildPecl {
   inherit version;
@@ -17,8 +16,8 @@ buildPecl {
   src = fetchFromGitHub {
     owner = "krakjoe";
     repo = "pcov";
-    rev = "v${version}";
-    sha256 = "sha256-lyY17Y9chpTO8oeWmDGSh0YSnipYqCuy1qmn9su5Eu8=";
+    tag = "v${version}";
+    hash = "sha256-lyY17Y9chpTO8oeWmDGSh0YSnipYqCuy1qmn9su5Eu8=";
   };
 
   buildInputs = [ pcre2 ];
@@ -27,15 +26,15 @@ buildPecl {
     # Allow building for PHP 8.4
     (fetchpatch {
       url = "https://github.com/krakjoe/pcov/commit/7d764c7c2555e8287351961d72be3ebec4d8743f.patch";
-      sha256 = "sha256-5wIHrrCwUXQpPdUg+3Kwyop5yvOzQQ3qc4pQXU8q2OM=";
+      hash = "sha256-5wIHrrCwUXQpPdUg+3Kwyop5yvOzQQ3qc4pQXU8q2OM=";
     })
   ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/krakjoe/pcov/releases/tag/v${version}";
     description = "Self contained php-code-coverage compatible driver for PHP";
-    license = licenses.php301;
+    license = lib.licenses.php301;
     homepage = "https://github.com/krakjoe/pcov";
-    maintainers = teams.php.members;
+    maintainers = lib.teams.php.members;
   };
 }

From 8f0516b7d4a74b9c95a5f576ff148fc3333b1edf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 17 Feb 2025 21:58:56 +0100
Subject: [PATCH 13/60] youtube-music: 3.7.2 -> 3.7.4

Changelog: https://github.com/th-ch/youtube-music/releases/tag/v3.7.3
Changelog: https://github.com/th-ch/youtube-music/releases/tag/v3.7.4
---
 pkgs/applications/audio/youtube-music/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix
index c989bdf5cf1f..ef035a500226 100644
--- a/pkgs/applications/audio/youtube-music/default.nix
+++ b/pkgs/applications/audio/youtube-music/default.nix
@@ -13,18 +13,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "youtube-music";
-  version = "3.7.2";
+  version = "3.7.4";
 
   src = fetchFromGitHub {
     owner = "th-ch";
     repo = "youtube-music";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-gZ3EvIjPa/THRwMigglGp+Wtv+wEN7V11KOu1QsyJpE=";
+    hash = "sha256-qzvfYxM5mxxujWE0SDUapmN+Px9NkP58e1UeLEtZ7bc=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-4yeLfolBquKFjKB4iYj8rMPvclfpjwHhV6/Xb/YNQWo=";
+    hash = "sha256-guD1yWFd+uO9H/egHS0PJ9HIIlF+wFS/98YtvjIzZW8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5d9e8ce8a00..e2a508637f60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15785,7 +15785,7 @@ with pkgs;
   youtube-dl-light = with python3Packages; toPythonApplication youtube-dl-light;
 
   youtube-music = callPackage ../applications/audio/youtube-music {
-    pnpm = pnpm_9;
+    pnpm = pnpm_10;
   };
 
   youtube-tui = callPackage ../applications/video/youtube-tui {

From 108b5eec8fe7683684e5bb981f986e249ad29e1c Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 17 Feb 2025 21:54:33 +0100
Subject: [PATCH 14/60] php84Extensions.pdo_oci: fix build with PHP >= 8.4

---
 .../php-packages/pdo_oci/default.nix          | 29 +++++++++++++++++++
 pkgs/top-level/php-packages.nix               | 28 ++++++++++--------
 2 files changed, 45 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/development/php-packages/pdo_oci/default.nix

diff --git a/pkgs/development/php-packages/pdo_oci/default.nix b/pkgs/development/php-packages/pdo_oci/default.nix
new file mode 100644
index 000000000000..f4e4bb2856d8
--- /dev/null
+++ b/pkgs/development/php-packages/pdo_oci/default.nix
@@ -0,0 +1,29 @@
+{
+  buildPecl,
+  lib,
+  oracle-instantclient,
+  php,
+}:
+
+buildPecl {
+  version = "1.1.0";
+  pname = "pdo_oci";
+
+  hash = "sha256-XKtpWH6Rn8s19Wlu15eb/6dcCpJ7Bc/pr9Pxi8L4S8c=";
+
+  buildInputs = [ oracle-instantclient ];
+  configureFlags = [ "--with-pdo-oci=instantclient,${oracle-instantclient.lib}/lib" ];
+
+  internalDeps = [ php.extensions.pdo ];
+  postPatch = ''
+    sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${oracle-instantclient.dev}/include"|' config.m4
+  '';
+
+  meta = {
+    changelog = "https://pecl.php.net/package-changelog.php?package=PDO_OCI";
+    description = "The PHP PDO_OCI extension lets you access Oracle Database";
+    license = lib.licenses.php301;
+    homepage = "https://pecl.php.net/package/pdo_oci";
+    maintainers = lib.teams.php.members;
+  };
+}
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 978c42a0d305..b7d13f2a9637 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -342,22 +342,26 @@ lib.makeScope pkgs.newScope (
 
         pcov = callPackage ../development/php-packages/pcov { };
 
-        pdo_oci = buildPecl rec {
-          inherit (php.unwrapped) src version;
+        pdo_oci =
+          if (lib.versionAtLeast php.version "8.4") then
+            callPackage ../development/php-packages/pdo_oci { }
+          else
+            buildPecl rec {
+              inherit (php.unwrapped) src version;
 
-          pname = "pdo_oci";
-          sourceRoot = "php-${version}/ext/pdo_oci";
+              pname = "pdo_oci";
+              sourceRoot = "php-${version}/ext/pdo_oci";
 
-          buildInputs = [ pkgs.oracle-instantclient ];
-          configureFlags = [ "--with-pdo-oci=instantclient,${pkgs.oracle-instantclient.lib}/lib" ];
+              buildInputs = [ pkgs.oracle-instantclient ];
+              configureFlags = [ "--with-pdo-oci=instantclient,${pkgs.oracle-instantclient.lib}/lib" ];
 
-          internalDeps = [ php.extensions.pdo ];
-          postPatch = ''
-            sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4
-          '';
+              internalDeps = [ php.extensions.pdo ];
+              postPatch = ''
+                sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4
+              '';
 
-          meta.maintainers = lib.teams.php.members;
-        };
+              meta.maintainers = lib.teams.php.members;
+            };
 
         pdo_sqlsrv = callPackage ../development/php-packages/pdo_sqlsrv { };
 

From 12f61a1118d61b4c16a296c51767b2fb5642a60a Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Mon, 17 Feb 2025 21:10:16 +0000
Subject: [PATCH 15/60] protonplus: 0.4.23 -> 0.4.24

Diff: https://github.com/Vysp3r/ProtonPlus/compare/v0.4.23...v0.4.24

Changelog: https://github.com/Vysp3r/ProtonPlus/releases/tag/v0.4.24
---
 pkgs/by-name/pr/protonplus/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/protonplus/package.nix b/pkgs/by-name/pr/protonplus/package.nix
index 9e38380dbb2a..352fb91dfb21 100644
--- a/pkgs/by-name/pr/protonplus/package.nix
+++ b/pkgs/by-name/pr/protonplus/package.nix
@@ -20,13 +20,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "protonplus";
-  version = "0.4.23";
+  version = "0.4.24";
 
   src = fetchFromGitHub {
     owner = "Vysp3r";
     repo = "protonplus";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-axVtURzMLPv+CgDJZj/TM4sfysW+GJWZ+MEe9Z6DhHE=";
+    hash = "sha256-nmwdXcd5V8gbq96Cen5494429JvKXgYBuQgCgMrhuWk=";
   };
 
   nativeBuildInputs = [

From 90a3babd36ef56d1d63ebc624c2040c348d87b46 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Mon, 17 Feb 2025 21:10:54 +0000
Subject: [PATCH 16/60] sydbox: 3.30.1 -> 3.32.2

Diff: https://gitlab.exherbo.org/sydbox/sydbox/-/compare/v3.32.2...v3.30.1

Changelog: https://gitlab.exherbo.org/sydbox/sydbox/-/blob/v3.32.2/ChangeLog.md
---
 pkgs/by-name/sy/sydbox/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix
index 0f247a1c50b8..dd45b7f52c5d 100644
--- a/pkgs/by-name/sy/sydbox/package.nix
+++ b/pkgs/by-name/sy/sydbox/package.nix
@@ -13,7 +13,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sydbox";
-  version = "3.30.1";
+  version = "3.32.2";
 
   outputs = [
     "out"
@@ -25,11 +25,11 @@ rustPlatform.buildRustPackage rec {
     owner = "Sydbox";
     repo = "sydbox";
     tag = "v${version}";
-    hash = "sha256-Vby+2uSosp5yHc99lB2nMozMfsLowPunXuS30evKiZk=";
+    hash = "sha256-afuOpRRjUDYCIERSQzrVykrxc9bxRvUqU62aA/Z83VY=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-1Em6ibjYXWnCIF1r7qS2uKvBAhb1klGjwrv9E6PTQCU=";
+  cargoHash = "sha256-NasGY1FTdO3EtnIkNcvntnR3aiCe0mUrVCBnwiNy7Bs=";
 
   nativeBuildInputs = [
     mandoc

From 27d6497ba9367e16173ce0a84b6809d108f0d0b9 Mon Sep 17 00:00:00 2001
From: Dionysis Grigoropoulos <dgrig@erethon.com>
Date: Mon, 17 Feb 2025 23:34:03 +0200
Subject: [PATCH 17/60] python3Packages.rns: 0.9.1 -> 0.9.2

Diff: https://github.com/markqvist/Reticulum/compare/0.9.1...0.9.2

Changelog: https://github.com/markqvist/Reticulum/releases/tag/0.9.2
---
 pkgs/development/python-modules/rns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix
index 89dccd77fdb8..5f7cdf8f5273 100644
--- a/pkgs/development/python-modules/rns/default.nix
+++ b/pkgs/development/python-modules/rns/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "rns";
-  version = "0.9.1";
+  version = "0.9.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "markqvist";
     repo = "Reticulum";
     tag = version;
-    hash = "sha256-AR7JMvx5qWPFtMhotO2MlqKH5d/CcGOrvpaB031vTX8=";
+    hash = "sha256-BnR+gVcV4ul/z6Yoj4KFisBqGK0HOHfsisTNqLPrgF8=";
   };
 
   patches = [

From 561ac4c3e79508fea794979e9a1e830fd2de9ccd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 17 Feb 2025 21:40:29 +0000
Subject: [PATCH 18/60] python312Packages.jpype1: 1.5.1 -> 1.5.2

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

diff --git a/pkgs/development/python-modules/jpype1/default.nix b/pkgs/development/python-modules/jpype1/default.nix
index 7449573ba014..9aed829e8900 100644
--- a/pkgs/development/python-modules/jpype1/default.nix
+++ b/pkgs/development/python-modules/jpype1/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "jpype1";
-  version = "1.5.1";
+  version = "1.5.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "originell";
     repo = "jpype";
     tag = "v${version}";
-    hash = "sha256-IMmMYlcTkOQ5P4FYTp1QmUY9AsnYhzJ3mcpgl52qImg=";
+    hash = "sha256-Q5/umU7JHiro+7YuC6nVG9ocpQ/Yc4LGa5+7SGGARTo=";
   };
 
   build-system = [ setuptools ];

From 23a1c8add3b5a89087ac0182f5124f4d7d8f2496 Mon Sep 17 00:00:00 2001
From: Katherine Jamison <axertheaxe@proton.me>
Date: Mon, 17 Feb 2025 20:15:36 -0700
Subject: [PATCH 19/60] linuxKernel.kernels.linux_{lqx,zen}: add axertheaxe as
 maintainer

---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index b3c123022de9..fc5c2ab5b2f4 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -140,6 +140,7 @@ let
           maintainers = with lib.maintainers; [
             thiagokokada
             jerrysm64
+            axertheaxe
           ];
           description =
             "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads."

From eb230c2cc2c8eff41c8273e1272f2c4ff4993a1b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Feb 2025 03:56:17 +0000
Subject: [PATCH 20/60] troubadix: 25.1.4 -> 25.2.0

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

diff --git a/pkgs/by-name/tr/troubadix/package.nix b/pkgs/by-name/tr/troubadix/package.nix
index 196591366b29..72451431393e 100644
--- a/pkgs/by-name/tr/troubadix/package.nix
+++ b/pkgs/by-name/tr/troubadix/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "troubadix";
-  version = "25.1.4";
+  version = "25.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "troubadix";
     tag = "v${version}";
-    hash = "sha256-AMvYjspaLxqxq/6Nb5KMMfwWMhXfeB8NHWeveGNsWQY=";
+    hash = "sha256-pNxQOoh4vRme8ORlyN+ZqtpPTeTG5Yh5nm14jOo8MFc=";
   };
 
   pythonRelaxDeps = [
@@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication rec {
   meta = with lib; {
     description = "Linting tool for NASL files";
     homepage = "https://github.com/greenbone/troubadix";
-    changelog = "https://github.com/greenbone/troubadix/releases/tag/v${version}";
+    changelog = "https://github.com/greenbone/troubadix/releases/tag/${src.tag}";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ fab ];
     mainProgram = "troubadix";

From 13d9b32d2bc54b0244c411e6ec8b392e559853fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Feb 2025 04:11:11 +0000
Subject: [PATCH 21/60] terraform-providers.harbor: 3.10.18 -> 3.10.19

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

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index b0f2b6a05f6a..67e4ec75751b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -552,13 +552,13 @@
     "vendorHash": null
   },
   "harbor": {
-    "hash": "sha256-FSuJ8upRnDny9Rjf+hS+Kd6e3YcuqYRMfwMwseHNlfo=",
+    "hash": "sha256-s3tmPNzaiSnUqOpg1luj2M5pZMfbfw98XDJfwXatoM4=",
     "homepage": "https://registry.terraform.io/providers/goharbor/harbor",
     "owner": "goharbor",
     "repo": "terraform-provider-harbor",
-    "rev": "v3.10.18",
+    "rev": "v3.10.19",
     "spdx": "MIT",
-    "vendorHash": "sha256-YkTXwx3RjIbzJnagfcYgb5IRnF0sHEDBDzdHf+GS8xI="
+    "vendorHash": "sha256-qDyMoIfWE1m1+edu6Y7L9gfGVH+GdmVVjQQDet3nu1g="
   },
   "hcloud": {
     "hash": "sha256-nkp4XTFRBSxqRAURL0O4H/l7oDF/OEXmew0MkmyQryc=",

From bc7ba2fc707371c9094d63653dee2ebb13aef5c6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Feb 2025 05:21:42 +0000
Subject: [PATCH 22/60] codeql: 2.20.3 -> 2.20.4

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

diff --git a/pkgs/by-name/co/codeql/package.nix b/pkgs/by-name/co/codeql/package.nix
index b90ec95819a5..b6f2e05c4337 100644
--- a/pkgs/by-name/co/codeql/package.nix
+++ b/pkgs/by-name/co/codeql/package.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   pname = "codeql";
-  version = "2.20.3";
+  version = "2.20.4";
 
   dontConfigure = true;
   dontBuild = true;
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
-    hash = "sha256-J5zPIfQz1RRCLfer1gL/5ZbLT/Wb+SUTUWF2pMyvdxk=";
+    hash = "sha256-oxqprZwPW6qwp3ilPhtQ+cxXeyzC4xZm9L9bkiFgxys=";
   };
 
   nativeBuildInputs = [

From 7df22f33ab420638c01a359fa91464de13d0a619 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Feb 2025 05:40:55 +0000
Subject: [PATCH 23/60] louvre: 2.14.0-1 -> 2.14.1-1

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

diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix
index 248e5c634ea9..3fa3286b7182 100644
--- a/pkgs/by-name/lo/louvre/package.nix
+++ b/pkgs/by-name/lo/louvre/package.nix
@@ -24,13 +24,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "louvre";
-  version = "2.14.0-1";
+  version = "2.14.1-1";
 
   src = fetchFromGitHub {
     owner = "CuarzoSoftware";
     repo = "Louvre";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-2qFtgKOqTBPTKiZ5/RuQEUK8GPwm9Nv8bc7+y+3+0Ow=";
+    hash = "sha256-fZ9lH7kfp++YONI3Kr4fJX1SsemhoJGdgz6eEeHKA6Q=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";

From 57d25df9911d56a0d0b358c9f957ab5108c2df25 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Feb 2025 06:27:10 +0000
Subject: [PATCH 24/60] allure: 2.32.1 -> 2.32.2

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

diff --git a/pkgs/by-name/al/allure/package.nix b/pkgs/by-name/al/allure/package.nix
index e440d5f9173c..a3f1d9478a91 100644
--- a/pkgs/by-name/al/allure/package.nix
+++ b/pkgs/by-name/al/allure/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "allure";
-  version = "2.32.1";
+  version = "2.32.2";
 
   src = fetchurl {
     url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz";
-    hash = "sha256-EpTcdF1v6Os7FL/stqRR6OtZoPGuWp8qoC6U7NtBtaY=";
+    hash = "sha256-/hcsXcLT6V2mSJMHBcjFRMFA0uuILQQDIKmrLNRsh9s=";
   };
 
   dontConfigure = true;

From a748ed16f7176518ef685c2802f3b41bc5dde003 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Feb 2025 06:56:24 +0000
Subject: [PATCH 25/60] cryptomator: 1.15.0 -> 1.15.1

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

diff --git a/pkgs/by-name/cr/cryptomator/package.nix b/pkgs/by-name/cr/cryptomator/package.nix
index 1badd7aee2ff..bee6f77e3291 100644
--- a/pkgs/by-name/cr/cryptomator/package.nix
+++ b/pkgs/by-name/cr/cryptomator/package.nix
@@ -17,13 +17,13 @@ let
 in
 maven.buildMavenPackage rec {
   pname = "cryptomator";
-  version = "1.15.0";
+  version = "1.15.1";
 
   src = fetchFromGitHub {
     owner = "cryptomator";
     repo = "cryptomator";
     tag = version;
-    hash = "sha256-fGn8jsPHwGHSiXgIfkMtSYut6pVg8p9+N/uDUlj2Wwc=";
+    hash = "sha256-yNCVSaA2GtTFUYoN7IZxEYMxkkQwMiNnfnmSXaruFjM=";
   };
 
   mvnJdk = jdk;

From 3c80347b98c38ce894c0d57e4664dfaf008d38d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Feb 2025 06:56:38 +0000
Subject: [PATCH 26/60] flix: 0.57.0 -> 0.57.1

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

diff --git a/pkgs/by-name/fl/flix/package.nix b/pkgs/by-name/fl/flix/package.nix
index 066f77dd8644..082564f802cc 100644
--- a/pkgs/by-name/fl/flix/package.nix
+++ b/pkgs/by-name/fl/flix/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "flix";
-  version = "0.57.0";
+  version = "0.57.1";
 
   src = fetchurl {
     url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar";
-    sha256 = "sha256-8qiNh8a6fwKkCeTGda/rBVWFSbYJsLRg27CxQsuL9Mo=";
+    sha256 = "sha256-baUKhAC0M4nLbukxdWaxsToGGS1Zb+Oj9CTCqtwHE4o=";
   };
 
   dontUnpack = true;

From ca7dd8701684d8b236c758d88d3e64a8060c941c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Feb 2025 07:58:15 +0000
Subject: [PATCH 27/60] cedar: 4.3.1 -> 4.3.2

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

diff --git a/pkgs/by-name/ce/cedar/package.nix b/pkgs/by-name/ce/cedar/package.nix
index 4eefcc70335d..21304e642ff4 100644
--- a/pkgs/by-name/ce/cedar/package.nix
+++ b/pkgs/by-name/ce/cedar/package.nix
@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cedar";
-  version = "4.3.1";
+  version = "4.3.2";
 
   src = fetchFromGitHub {
     owner = "cedar-policy";
     repo = "cedar";
     tag = "v${version}";
-    hash = "sha256-1EJvLQDQQTiNwPe0Ynt6VI3RD/3jGbt/0H7pzGcl1wA=";
+    hash = "sha256-by2Y+zh2fMvobFLl2eiUWtw2iU/znKt8YoZGKvdJK+g=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-vkJjUmzuYwR/GI/7h0S2AOXJ8Im074a7QzXDs23rIak=";
+  cargoHash = "sha256-5g4YYs96Dxp7HaZpHO3drEekZoDz/yiO0ngWeTnwnbo=";
 
   passthru = {
     tests.version = testers.testVersion { package = cedar; };

From faac398dad7753b4a2331378ccf64558c4f3e2f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Feb 2025 08:02:53 +0000
Subject: [PATCH 28/60] pkgsite: 0-unstable-2025-01-31 -> 0-unstable-2025-02-14

---
 pkgs/by-name/pk/pkgsite/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix
index df8c1bb0dcc2..4edc9b90ac10 100644
--- a/pkgs/by-name/pk/pkgsite/package.nix
+++ b/pkgs/by-name/pk/pkgsite/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "pkgsite";
-  version = "0-unstable-2025-01-31";
+  version = "0-unstable-2025-02-14";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "pkgsite";
-    rev = "50d4697cc82f2eedc49fc659871d1e81ca4c6164";
-    hash = "sha256-zDUsMkhQH/KJDjUE6mw/zRF23Ad3VIfqjEIY374Y9GE=";
+    rev = "dd488e5da97a2d18430760c4558bf0b6be1a4bfd";
+    hash = "sha256-1tzoHN9kXFkTwwH6loMnagbYX6s9YPhSPXgw/groklE=";
   };
 
-  vendorHash = "sha256-Z+Ji3RO2zn5vn9DXOAxyeI4OZXGOfyVdfdIsNyJHZpE=";
+  vendorHash = "sha256-Zb0rhIgdP5Ct8ypuEwRBrN2k+UZ6bZceI3B1XAMC0dk=";
 
   subPackages = [ "cmd/pkgsite" ];
 

From 74d6325048818ccbdc4d20a649c573d2e0ffe42c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Feb 2025 08:34:44 +0000
Subject: [PATCH 29/60] structorizer: 3.32-25 -> 3.32-26

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

diff --git a/pkgs/by-name/st/structorizer/package.nix b/pkgs/by-name/st/structorizer/package.nix
index a112a0bb0112..9b8db6ac84a7 100644
--- a/pkgs/by-name/st/structorizer/package.nix
+++ b/pkgs/by-name/st/structorizer/package.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   pname = "structorizer";
-  version = "3.32-25";
+  version = "3.32-26";
 
   desktopItems = [
     (makeDesktopItem {
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     owner = "fesch";
     repo = "Structorizer.Desktop";
     rev = version;
-    hash = "sha256-JZHS3QtPNVajrNkEoAT606Yn2OZ8KuFeMZCxNyZxAy8=";
+    hash = "sha256-hRcs0fey+6YCXcWXNTWuAnaRfmRNL2Cpn+dry8wYRSg=";
   };
 
   patches = [

From 5f8fb9bc1435438b11729e088355b39c2f63bcd2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Feb 2025 09:22:06 +0000
Subject: [PATCH 30/60] zoekt: 3.7.2-2-unstable-2025-02-02 ->
 3.7.2-2-unstable-2025-02-17

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

diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix
index ac1808f7b8b8..631565f67cc9 100644
--- a/pkgs/by-name/zo/zoekt/package.nix
+++ b/pkgs/by-name/zo/zoekt/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule {
   pname = "zoekt";
-  version = "3.7.2-2-unstable-2025-02-02";
+  version = "3.7.2-2-unstable-2025-02-17";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "zoekt";
-    rev = "261aae37dce6a46cdf1eb669d95d314adc0758e7";
-    hash = "sha256-ReyUai63hs+cfBo8v3CuKtCBmtLEUWOUR3zBI82eXOQ=";
+    rev = "914a27d7d2e2b489a70e0fc1c6ce64aae8e7964b";
+    hash = "sha256-kUCFAWIyHPzHdhMshrSYSGBIyGD0Nh9HNJRqia5qh/Q=";
   };
 
   vendorHash = "sha256-7bpoUxhoVc74bN9/B6TWyufSvDRD90KpIXUMKK+3BcU=";

From cafb803cba1e13a6d4f626e2270322d5d2fea556 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Feb 2025 10:11:58 +0000
Subject: [PATCH 31/60] mov-cli: 4.4.16 -> 4.4.18

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

diff --git a/pkgs/by-name/mo/mov-cli/package.nix b/pkgs/by-name/mo/mov-cli/package.nix
index 0e0c0004ebe3..c1980c975fa5 100644
--- a/pkgs/by-name/mo/mov-cli/package.nix
+++ b/pkgs/by-name/mo/mov-cli/package.nix
@@ -9,7 +9,7 @@
 
 let
   pname = "mov-cli";
-  version = "4.4.16";
+  version = "4.4.18";
 in
 python3.pkgs.buildPythonPackage {
   inherit pname version;
@@ -19,7 +19,7 @@ python3.pkgs.buildPythonPackage {
     owner = "mov-cli";
     repo = "mov-cli";
     tag = version;
-    hash = "sha256-hOnbBXzg9S0pqEcdXVrdG+P9tLqE8NC++ppOwqd+y+M=";
+    hash = "sha256-4NgDhxBL2llla0248hAflVbqFaRUmITCafLHQWagLOM=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

From e0647dcfaf85014baa21e728031bcbc2e47562cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Feb 2025 11:07:35 +0000
Subject: [PATCH 32/60] circup: 2.1.1 -> 2.1.2

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

diff --git a/pkgs/by-name/ci/circup/package.nix b/pkgs/by-name/ci/circup/package.nix
index c7464f2ee953..2f4ac456ecbb 100644
--- a/pkgs/by-name/ci/circup/package.nix
+++ b/pkgs/by-name/ci/circup/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "circup";
-  version = "2.1.1";
+  version = "2.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "adafruit";
     repo = "circup";
     tag = version;
-    hash = "sha256-G2c2Psd5cyjKkpqYQOLVWSeLIWdoxYm45KLT0q7cTzQ=";
+    hash = "sha256-lmuxqkZVByJwnfHj4yljWQwTvdLnguq3hZm6a7LN6Xo=";
   };
 
   pythonRelaxDeps = [ "semver" ];
@@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec {
   meta = with lib; {
     description = "CircuitPython library updater";
     homepage = "https://github.com/adafruit/circup";
-    changelog = "https://github.com/adafruit/circup/releases/tag/${version}";
+    changelog = "https://github.com/adafruit/circup/releases/tag/${src.tag}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
     mainProgram = "circup";

From 654ab78aa6b15217f847ead6fee8f6522dc83e4e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Feb 2025 12:32:22 +0000
Subject: [PATCH 33/60] umurmur: 0.2.20 -> 0.3.0

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

diff --git a/pkgs/by-name/um/umurmur/package.nix b/pkgs/by-name/um/umurmur/package.nix
index d2e5aa049896..60f42bf77bdc 100644
--- a/pkgs/by-name/um/umurmur/package.nix
+++ b/pkgs/by-name/um/umurmur/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "umurmur";
-  version = "0.2.20";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "umurmur";
     repo = "umurmur";
     rev = version;
-    sha256 = "sha256-jp5+NbGmT90ksffvpLYIX2q5cPeVidDCYMPvLHCiP68=";
+    sha256 = "sha256-q5k1Lv+/Kz602QFcdb/FoWWaH9peAQIf7u1NTCWKTBM=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From d461b13ba860251e0c60877b6f44c67f16804929 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Feb 2025 13:26:02 +0000
Subject: [PATCH 34/60] witness: 0.7.0 -> 0.8.0

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

diff --git a/pkgs/by-name/wi/witness/package.nix b/pkgs/by-name/wi/witness/package.nix
index d52ea85af158..fbeb249cd0c2 100644
--- a/pkgs/by-name/wi/witness/package.nix
+++ b/pkgs/by-name/wi/witness/package.nix
@@ -11,15 +11,15 @@
 
 buildGoModule rec {
   pname = "witness";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "in-toto";
     repo = "witness";
     rev = "v${version}";
-    sha256 = "sha256-eHAEaecL4bJUZfFiXK3NqgTZU9l6b46WI/vDBuAqCUw=";
+    sha256 = "sha256-KqsBeKtMLLCtGoFfYOgIy0b+fYRpV7zCHVjPzgXj6Zo=";
   };
-  vendorHash = "sha256-AZRY8N88dUKAybdstSTRB8sirx4L4ZmiffQ7Qwlpb/8=";
+  vendorHash = "sha256-0zl+sdF6ZNAW2R9MskLvwfd1ppMtvFgkUvp5ibh23oI=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 1c134920e6a59f1a9cc90d4ba0c529b4001cd37a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Feb 2025 14:12:11 +0000
Subject: [PATCH 35/60] mdbook-admonish: 1.18.0 -> 1.19.0

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

diff --git a/pkgs/by-name/md/mdbook-admonish/package.nix b/pkgs/by-name/md/mdbook-admonish/package.nix
index 1e41e3056248..7533d25f6c7c 100644
--- a/pkgs/by-name/md/mdbook-admonish/package.nix
+++ b/pkgs/by-name/md/mdbook-admonish/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mdbook-admonish";
-  version = "1.18.0";
+  version = "1.19.0";
 
   src = fetchFromGitHub {
     owner = "tommilligan";
     repo = pname;
     tag = "v${version}";
-    hash = "sha256-GNQIOjgHCt3XPCzF0RjV9YStI8psLdHhTPuTkdgx8vA=";
+    hash = "sha256-rlJowyyB83bNqzOavggbwVJg9/GYZLYjGr8Pv/O6UBE=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-GbXLlWHbLL7HbyuX223S/o1/+LwbK8FjL7lnEgVVn00=";
+  cargoHash = "sha256-ilX/Tky3eQB0Aumz+gRRyaVz/MAM/qiNrGulZSPGUg0=";
 
   meta = {
     description = "Preprocessor for mdbook to add Material Design admonishments";

From 8b0a00d67a08a9e0dc6be6fcb3262bd126cea047 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Feb 2025 14:29:34 +0000
Subject: [PATCH 36/60] lighthouse-steamvr: 1.2.0 -> 1.3.0

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

diff --git a/pkgs/tools/misc/lighthouse-steamvr/default.nix b/pkgs/tools/misc/lighthouse-steamvr/default.nix
index 77afc0114258..fbb8e2647c67 100644
--- a/pkgs/tools/misc/lighthouse-steamvr/default.nix
+++ b/pkgs/tools/misc/lighthouse-steamvr/default.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "Lighthouse";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "ShayBox";
     repo = pname;
     rev = version;
-    hash = "sha256-uJ8U4knNKAliHjxP0JnV1lSCEsB6OHyYSbb5aWboYV4=";
+    hash = "sha256-3zcMxPOJ4Vvl3HTK13pG3/4duK+2O6i4acv9Uz5zWjA=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-YJgtkrDs7cBpjux0SE6TTXcduZRC+8+4SMMiCXYeCYI=";
+  cargoHash = "sha256-iVcNwWADF84yQyzIb8WJpJqWGVAaHOVnbdDHFeHXHyI=";
 
   nativeBuildInputs = [ pkg-config ];
 

From f1ad64212af3dac636ef3c3e37735fb31d0056fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Feb 2025 14:32:16 +0000
Subject: [PATCH 37/60] fn-cli: 0.6.36 -> 0.6.38

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

diff --git a/pkgs/by-name/fn/fn-cli/package.nix b/pkgs/by-name/fn/fn-cli/package.nix
index 01be247931a6..60a6d684efca 100644
--- a/pkgs/by-name/fn/fn-cli/package.nix
+++ b/pkgs/by-name/fn/fn-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "fn";
-  version = "0.6.36";
+  version = "0.6.38";
 
   src = fetchFromGitHub {
     owner = "fnproject";
     repo = "cli";
     rev = version;
-    hash = "sha256-JL1Xobmt6T7sSbEEj8L5+XB8/LbxMjhcmRxO//xVSQQ=";
+    hash = "sha256-JzOt0wjlChK07NhZ0y5kFtsmN5cLL4dJStogmGucAgc=";
   };
 
   vendorHash = null;

From 27178320875ea48abe31aab6ad902fa0127178a9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Feb 2025 00:06:10 +0000
Subject: [PATCH 38/60] i3wsr: 2.1.1 -> 3.1.1

---
 pkgs/applications/window-managers/i3/wsr.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/wsr.nix b/pkgs/applications/window-managers/i3/wsr.nix
index cc3e9bbce47b..dd2efb0a022c 100644
--- a/pkgs/applications/window-managers/i3/wsr.nix
+++ b/pkgs/applications/window-managers/i3/wsr.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "i3wsr";
-  version = "2.1.1";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "roosta";
-    repo = pname;
+    repo = "i3wsr";
     rev = "v${version}";
-    sha256 = "sha256-Mq4TpQDiIYePUS3EwBfOe2+QmvF6+WEDK12WahbuhSU=";
+    hash = "sha256-RTJ+up3mt6KuMkTBCXDUmztxwEQCeyAjuhhOUrdIfTo=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-ecFlektG6CcGvD2l39MuplknpXuJ5B08ydJunxI7Pvg=";
+  cargoHash = "sha256-7WS+8EGGl8sJ3TeT7IM+u1AiD0teJ2AITb++zK/keXs=";
 
   nativeBuildInputs = [ python3 ];
   buildInputs = [ libxcb ];

From 4be578e7dd9e81b258f67925bf2275e8bd1a7e72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Tue, 18 Feb 2025 09:57:45 -0500
Subject: [PATCH 39/60] yazi-unwrapped: add man pages

---
 pkgs/by-name/ya/yazi-unwrapped/package.nix | 28 ++++++++++++++++++----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ya/yazi-unwrapped/package.nix b/pkgs/by-name/ya/yazi-unwrapped/package.nix
index 574b9207f9a0..5b21ada86a24 100644
--- a/pkgs/by-name/ya/yazi-unwrapped/package.nix
+++ b/pkgs/by-name/ya/yazi-unwrapped/package.nix
@@ -8,18 +8,34 @@
   Foundation,
   rust-jemalloc-sys,
 }:
-
-rustPlatform.buildRustPackage rec {
-  pname = "yazi";
+let
   version = "25.2.11";
 
-  src = fetchFromGitHub {
+  code_src = fetchFromGitHub {
     owner = "sxyazi";
     repo = "yazi";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-yVpSoEmEA+/XF/jlJqKdkj86m8IZLAbrxDxz5ZnmP78=";
   };
 
+  man_src = fetchFromGitHub {
+    name = "manpages"; # needed to ensure name is unique
+    owner = "yazi-rs";
+    repo = "manpages";
+    rev = "8950e968f4a1ad0b83d5836ec54a070855068dbf";
+    hash = "sha256-kEVXejDg4ChFoMNBvKlwdFEyUuTcY2VuK9j0PdafKus=";
+  };
+in
+rustPlatform.buildRustPackage rec {
+  pname = "yazi";
+  inherit version;
+
+  srcs = [
+    code_src
+    man_src
+  ];
+  sourceRoot = code_src.name;
+
   useFetchCargoVendor = true;
   cargoHash = "sha256-AfXi68PNrYj6V6CYIPZT0t2l5KYTYrIzJgrcEPLW8FM=";
 
@@ -36,6 +52,8 @@ rustPlatform.buildRustPackage rec {
       --fish ./yazi-boot/completions/yazi.fish \
       --zsh  ./yazi-boot/completions/_yazi
 
+    installManPage ../${man_src.name}/yazi{.1,-config.5}
+
     install -Dm444 assets/yazi.desktop -t $out/share/applications
     install -Dm444 assets/logo.png $out/share/pixmaps/yazi.png
   '';

From 42b78d21fcf121e9ed2542e1067d7d678af7ee2a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Feb 2025 15:37:54 +0000
Subject: [PATCH 40/60] gosmee: 0.22.3 -> 0.22.4

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

diff --git a/pkgs/by-name/go/gosmee/package.nix b/pkgs/by-name/go/gosmee/package.nix
index f1cc58016c5c..47cd46c5f620 100644
--- a/pkgs/by-name/go/gosmee/package.nix
+++ b/pkgs/by-name/go/gosmee/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "gosmee";
-  version = "0.22.3";
+  version = "0.22.4";
 
   src = fetchFromGitHub {
     owner = "chmouel";
     repo = "gosmee";
     rev = "v${version}";
-    hash = "sha256-zfPD01ARc5nye3Iq01sziC72nnuY3LhZshNugBtdnXs=";
+    hash = "sha256-e+Mkhkk+PTeTipWFnjiJ8jLMYB7D+/FCWaOuaKe1jr4=";
   };
   vendorHash = null;
 

From 35578bcb0f643bd9fb6ae298e830318683f2f464 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Feb 2025 15:48:07 +0000
Subject: [PATCH 41/60] xh: 0.23.1 -> 0.24.0

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

diff --git a/pkgs/by-name/xh/xh/package.nix b/pkgs/by-name/xh/xh/package.nix
index 2afe5d5ef48e..a91cba99b26e 100644
--- a/pkgs/by-name/xh/xh/package.nix
+++ b/pkgs/by-name/xh/xh/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "xh";
-  version = "0.23.1";
+  version = "0.24.0";
 
   src = fetchFromGitHub {
     owner = "ducaale";
     repo = "xh";
     rev = "v${version}";
-    hash = "sha256-fNsiM9B3E34x8m+RuVlZXIhsoB0JaxloAUfa0RmXobQ=";
+    hash = "sha256-5Eq/rJ917zjlTnuxdIWhBNr8LA/ag+fyECYYX5k2S7I=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-uF2FoDgQQjLAiI2bjtLKmGxRINdF6RHSXR8j0TWDXkU=";
+  cargoHash = "sha256-jeEhlpOl4ZiR1kQxCI3e6jacszVogzROpFC2w43BjZ0=";
 
   buildFeatures = lib.optional withNativeTls "native-tls";
 

From a2fe0ce8953ea87f2c47b6aaf384a1c54186b364 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Tue, 18 Feb 2025 10:56:15 -0500
Subject: [PATCH 42/60] zed-editor: 0.173.10 -> 0.173.11

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

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 8b64da7f2ac4..818afbe97867 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -96,7 +96,7 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "zed-editor";
-  version = "0.173.10";
+  version = "0.173.11";
 
   outputs = [ "out" ] ++ lib.optional buildRemoteServer "remote_server";
 
@@ -104,7 +104,7 @@ rustPlatform.buildRustPackage rec {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${version}";
-    hash = "sha256-6GVRJUBCXD9ohRcOATK/tzh7e7icyZzA/SuCAL9DauQ=";
+    hash = "sha256-iHojGnVW8cNRVwHghDAymPrznFYWaC4n/WfjRYGsHtw=";
   };
 
   patches = [
@@ -124,7 +124,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-xtziusGBsSni/ZtG+OzIkWxp3azg54G4r/5Wi9n9cyc=";
+  cargoHash = "sha256-Gen/WJUoYgGYDYS1hW563dQc8zDMMQnvF0Mk49TNWJo=";
 
   nativeBuildInputs =
     [

From e5cafe9052a706ca4a4c9b8e138ff7c0b3ce0550 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 18 Feb 2025 17:32:59 +0100
Subject: [PATCH 43/60] pylyzer: 0.0.79 -> 0.0.80

Diff: https://github.com/mtshiba/pylyzer/compare/refs/tags/v0.0.79...v0.0.80

Changelog: https://github.com/mtshiba/pylyzer/releases/tag/v0.0.80
---
 pkgs/by-name/py/pylyzer/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/py/pylyzer/package.nix b/pkgs/by-name/py/pylyzer/package.nix
index 024a33dcb3e1..700abd346a9b 100644
--- a/pkgs/by-name/py/pylyzer/package.nix
+++ b/pkgs/by-name/py/pylyzer/package.nix
@@ -14,17 +14,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pylyzer";
-  version = "0.0.79";
+  version = "0.0.80";
 
   src = fetchFromGitHub {
     owner = "mtshiba";
     repo = "pylyzer";
     tag = "v${version}";
-    hash = "sha256-CCQluzwB2NAOKE11kQ60FMgIqfGsjgxeHwgJO9WF4Kw=";
+    hash = "sha256-UXzaLGTZSdhh1xs19mFdY0HfmQoHxYEJXU6IaTz+Rrs=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-6QqQpABNuy+Dd5EL/E6BXG7+TWXnZ9Tjzu57iSfXvSA=";
+  cargoHash = "sha256-HO5SZtSA/0yPcSP5ZqDua1SScJdU8aXd9xshCmxvsuE=";
 
   nativeBuildInputs = [
     gitMinimal

From b240039f813a76ea7c6acc1d3e10af1b422f2c7d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Feb 2025 16:56:10 +0000
Subject: [PATCH 44/60] frankenphp: 1.4.2 -> 1.4.3

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

diff --git a/pkgs/by-name/fr/frankenphp/package.nix b/pkgs/by-name/fr/frankenphp/package.nix
index d7395131df7f..acbe4c5e0366 100644
--- a/pkgs/by-name/fr/frankenphp/package.nix
+++ b/pkgs/by-name/fr/frankenphp/package.nix
@@ -31,13 +31,13 @@ let
 in
 buildGoModule rec {
   pname = "frankenphp";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "dunglas";
     repo = "frankenphp";
     tag = "v${version}";
-    hash = "sha256-lY0nZCaevAlTOLHozOvH1xtLFTLOv093N4mrETt4Lhg=";
+    hash = "sha256-k5kLPUI3dV8C4rBeAM3ghmwXtas/Q16v332M3JlL8jk=";
   };
 
   sourceRoot = "${src.name}/caddy";
@@ -45,7 +45,7 @@ buildGoModule rec {
   # frankenphp requires C code that would be removed with `go mod tidy`
   # https://github.com/golang/go/issues/26366
   proxyVendor = true;
-  vendorHash = "sha256-LqsdX2oivCYhXBGZBKP+V7iNUoZuW6lRFO9kUpeEvL4=";
+  vendorHash = "sha256-snSkbgZPc92uQnpDc9+zdyiFnO35vCXYk1e80AwbVGA=";
 
   buildInputs = [
     phpUnwrapped

From e44860ab2737c21ee0fce2c8140e4a114485c840 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Feb 2025 16:57:07 +0000
Subject: [PATCH 45/60] cnspec: 11.41.0 -> 11.42.0

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

diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix
index ccedb83598c2..abebb20ecdff 100644
--- a/pkgs/tools/security/cnspec/default.nix
+++ b/pkgs/tools/security/cnspec/default.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnspec";
-  version = "11.41.0";
+  version = "11.42.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${version}";
-    hash = "sha256-MAJFTlzBa9thdyVKS1zH9PKpIy2HXYESZR5zfOURIgI=";
+    hash = "sha256-Occ64wXqYzUw6RZ4fVb85ZotaLRw6R9EcF36BMLJ4ww=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-k9/SfOZvq7o0SzY7UP8MD2LUG7//z8p6ZJL6UXUZrIA=";
+  vendorHash = "sha256-rdNFH2DbZqilA9Qk+8MJeMBziRDoNQRQ7qbhdc1FUbU=";
 
   subPackages = [ "apps/cnspec" ];
 

From b921710b503a3244aeb739e5e2465c8ad903875c Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@users.noreply.github.com>
Date: Tue, 18 Feb 2025 09:55:14 -0800
Subject: [PATCH 46/60] maintainers: add josh

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9d90ff6dd4f4..6b8313b1653e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11477,6 +11477,12 @@
     github = "josephsurin";
     githubId = 14977484;
   };
+  josh = {
+    name = "Joshua Peek";
+    email = "josh@joshpeek.com";
+    github = "josh";
+    githubId = 137;
+  };
   joshainglis = {
     name = "Josha Inglis";
     email = "joshainglis@gmail.com";

From b9ae16305487198d1553e78a7ad9c7b8e2cfa1af Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@users.noreply.github.com>
Date: Sun, 16 Feb 2025 09:49:59 -0800
Subject: [PATCH 47/60] age-plugin-tpm: 0.2.0 -> 0.3.0

---
 nixos/tests/age-plugin-tpm-decrypt.nix        | 33 +++++++++++++++++++
 nixos/tests/all-tests.nix                     |  1 +
 pkgs/by-name/ag/age-plugin-tpm/package.nix    | 19 ++++++++---
 .../ag/age-plugin-tpm/tests/encrypt.nix       | 18 ++++++++++
 4 files changed, 66 insertions(+), 5 deletions(-)
 create mode 100644 nixos/tests/age-plugin-tpm-decrypt.nix
 create mode 100644 pkgs/by-name/ag/age-plugin-tpm/tests/encrypt.nix

diff --git a/nixos/tests/age-plugin-tpm-decrypt.nix b/nixos/tests/age-plugin-tpm-decrypt.nix
new file mode 100644
index 000000000000..d46bc875be18
--- /dev/null
+++ b/nixos/tests/age-plugin-tpm-decrypt.nix
@@ -0,0 +1,33 @@
+{ pkgs, lib, ... }:
+{
+  name = "age-plugin-tpm-decrypt";
+  meta = with lib.maintainers; {
+    maintainers = [
+      sgo
+      josh
+    ];
+  };
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      virtualisation.tpm.enable = true;
+      environment.systemPackages = with pkgs; [
+        age
+        age-plugin-tpm
+      ];
+    };
+
+  testScript = ''
+    machine.start()
+
+    machine.succeed("age-plugin-tpm --generate --output identity.txt")
+    machine.succeed("age-plugin-tpm --convert identity.txt --output recipient.txt")
+    machine.succeed("echo -n 'Hello World' >data.txt")
+
+    machine.succeed("age --encrypt --recipients-file recipient.txt --output data.age data.txt")
+    data = machine.succeed("age --decrypt --identity identity.txt data.age")
+
+    assert data == "Hello World"
+  '';
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 23beacd88d27..80eac3c033a9 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -112,6 +112,7 @@ in {
   aesmd = runTestOn ["x86_64-linux"] ./aesmd.nix;
   agate = runTest ./web-servers/agate.nix;
   agda = handleTest ./agda.nix {};
+  age-plugin-tpm-decrypt = runTest ./age-plugin-tpm-decrypt.nix;
   agorakit = runTest ./web-apps/agorakit.nix;
   airsonic = handleTest ./airsonic.nix {};
   akkoma = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./akkoma.nix {};
diff --git a/pkgs/by-name/ag/age-plugin-tpm/package.nix b/pkgs/by-name/ag/age-plugin-tpm/package.nix
index 0e8dc385600d..73437e75bd37 100644
--- a/pkgs/by-name/ag/age-plugin-tpm/package.nix
+++ b/pkgs/by-name/ag/age-plugin-tpm/package.nix
@@ -1,27 +1,31 @@
 {
   lib,
+  callPackage,
   buildGoModule,
   fetchFromGitHub,
+  nixosTests,
   swtpm,
   openssl,
+  age,
 }:
 
 buildGoModule rec {
   pname = "age-plugin-tpm";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "Foxboron";
     repo = "age-plugin-tpm";
-    rev = "v${version}";
-    hash = "sha256-oTvK8U5j+llHgoChhGb+vcUrUf9doVYxd3d5MEuCNz8=";
+    tag = "v${version}";
+    hash = "sha256-yr1PSSmcUoOrQ8VMQEoaCLNvDO+3+6N7XXdNUyYVz9M=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-veduD0K3Onkqvyg9E5v854a6/8UIRQZEH098lUepRNU=";
+  vendorHash = "sha256-VEx6qP02QcwETOQUkMsrqVb+cOElceXcTDaUr480ngs=";
 
   nativeCheckInputs = [
+    age
     swtpm
   ];
 
@@ -34,12 +38,17 @@ buildGoModule rec {
     "-w"
   ];
 
+  passthru.tests = {
+    encrypt = callPackage ./tests/encrypt.nix { };
+    decrypt = nixosTests.age-plugin-tpm-decrypt;
+  };
+
   meta = with lib; {
     description = "TPM 2.0 plugin for age (This software is experimental, use it at your own risk)";
     mainProgram = "age-plugin-tpm";
     homepage = "https://github.com/Foxboron/age-plugin-tpm";
     license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.all;
     maintainers = with maintainers; [
       kranzes
       sgo
diff --git a/pkgs/by-name/ag/age-plugin-tpm/tests/encrypt.nix b/pkgs/by-name/ag/age-plugin-tpm/tests/encrypt.nix
new file mode 100644
index 000000000000..fe652b30792b
--- /dev/null
+++ b/pkgs/by-name/ag/age-plugin-tpm/tests/encrypt.nix
@@ -0,0 +1,18 @@
+{
+  runCommand,
+  age,
+  age-plugin-tpm,
+}:
+runCommand "age-plugin-tpm-encrypt"
+  {
+    nativeBuildInputs = [
+      age
+      age-plugin-tpm
+    ];
+    # example pubkey from Foxboron/age-plugin-tpm README
+    env.AGE_RECIPIENT = "age1tpm1qg86fn5esp30u9h6jy6zvu9gcsvnac09vn8jzjxt8s3qtlcv5h2x287wm36";
+  }
+  ''
+    echo "Hello World" | age --encrypt --armor --recipient "$AGE_RECIPIENT"
+    touch $out
+  ''

From 613a39c66e9e3ad85d50a7ca2ea052f70475f356 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 18 Feb 2025 17:38:32 +0300
Subject: [PATCH 48/60] kdePackages: Plasma 6.3.0 -> 6.3.1

---
 pkgs/kde/generated/sources/plasma.json        | 402 +++++++++---------
 pkgs/kde/plasma/kwin/default.nix              |   7 -
 pkgs/kde/plasma/plasma-desktop/default.nix    |   5 +
 .../kde/plasma/plasma-desktop/fix-build.patch | 107 +++++
 4 files changed, 313 insertions(+), 208 deletions(-)
 create mode 100644 pkgs/kde/plasma/plasma-desktop/fix-build.patch

diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json
index 4fcd394c04a1..9b10cdc176d1 100644
--- a/pkgs/kde/generated/sources/plasma.json
+++ b/pkgs/kde/generated/sources/plasma.json
@@ -1,337 +1,337 @@
 {
   "bluedevil": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/bluedevil-6.3.0.tar.xz",
-    "hash": "sha256-uqgVjWesGDHzIwx828RAw9Vt6BRwg8gZUv2i2azssoQ="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/bluedevil-6.3.1.tar.xz",
+    "hash": "sha256-qRNYzGSs6s6Sc8KTnOMlyROu7f6Jb1NYHJ7ECHJY/6s="
   },
   "breeze": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/breeze-6.3.0.tar.xz",
-    "hash": "sha256-e7UN1mLjXf2u7JWPrUIU5sPBRISRmrEqVFoRCfvgiZU="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/breeze-6.3.1.tar.xz",
+    "hash": "sha256-LHP1WTyXZh/CX7GveqApzbv5N0y4QrA2tVPAvMSZlRw="
   },
   "breeze-grub": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/breeze-grub-6.3.0.tar.xz",
-    "hash": "sha256-sQCf31ZSG9KEAnRjnM5AXRDiDldJKrYrWSuBWmGFvhw="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/breeze-grub-6.3.1.tar.xz",
+    "hash": "sha256-coKBDmb3kZouawD3JVqke8l1ObzY8Jmj+IYhxbBqA/s="
   },
   "breeze-gtk": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/breeze-gtk-6.3.0.tar.xz",
-    "hash": "sha256-Jrd9zu3h8mh99jZlxLoODnnbyarO/HSFhQL4Fu0yZfg="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/breeze-gtk-6.3.1.tar.xz",
+    "hash": "sha256-QMpeQYixJ6p2L8SXKicHQcMvbOsYScQd9WkrjE4qJ6U="
   },
   "breeze-plymouth": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/breeze-plymouth-6.3.0.tar.xz",
-    "hash": "sha256-BYlAsh647wIQ3RHMsOwfjiDBe2jOi404vE7qImBQBII="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/breeze-plymouth-6.3.1.tar.xz",
+    "hash": "sha256-Gd4ZnckVgpspWoN9FD92Y4VUgh/GYm+vmUHAEWDXTg4="
   },
   "discover": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/discover-6.3.0.tar.xz",
-    "hash": "sha256-v1kqF0opluIQgfK+wGjb7umrlF3w7s8tRlvkSOAj6ps="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/discover-6.3.1.tar.xz",
+    "hash": "sha256-RKgnKj/JEiaNiyRh/tbnGT4OZtJ4WO1bus0LjlMZpxg="
   },
   "drkonqi": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/drkonqi-6.3.0.tar.xz",
-    "hash": "sha256-ZSu8VecEccp6zxONgKI3/PXhB+QNKssOx58DqtUAlIk="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/drkonqi-6.3.1.tar.xz",
+    "hash": "sha256-01sur6jzbogJxHrMlh4b5PhTSLZVF4wkzXLckSbWj5c="
   },
   "flatpak-kcm": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/flatpak-kcm-6.3.0.tar.xz",
-    "hash": "sha256-9XmPHQzO6bUCicy0EHFdNf7N5f0a181ITJGPFJxtUSE="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/flatpak-kcm-6.3.1.tar.xz",
+    "hash": "sha256-zmVSFjhLPODKYh/xz7gUe3TMv7r+cwZOYHwU08aSSYU="
   },
   "kactivitymanagerd": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/kactivitymanagerd-6.3.0.tar.xz",
-    "hash": "sha256-Il9k5WjlWePm7I6aBS2E+zxVfhbp1PgbVnGZCBGnVe4="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/kactivitymanagerd-6.3.1.tar.xz",
+    "hash": "sha256-tDX7BE9mZIt8l2l5y7jeFWf846UR6E1hJ20WNxGc3qQ="
   },
   "kde-cli-tools": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/kde-cli-tools-6.3.0.tar.xz",
-    "hash": "sha256-zMvNc38fQz8u6xfuHjuMwQtnOhO2hbwNYKORl4/Jezs="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/kde-cli-tools-6.3.1.tar.xz",
+    "hash": "sha256-MvjUlbbKSwmNIoXpRyEcAZXuVTsYfeeSyirUoLA8upA="
   },
   "kde-gtk-config": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/kde-gtk-config-6.3.0.tar.xz",
-    "hash": "sha256-9SkQ8j7zamMDfkASSozxU2JygK45s/ijHtHy20iHmE8="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/kde-gtk-config-6.3.1.tar.xz",
+    "hash": "sha256-45cnMqaWl2csiTPeoh/cMohbKKRwcbvP2HkScNWC1io="
   },
   "kdecoration": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/kdecoration-6.3.0.tar.xz",
-    "hash": "sha256-dPf0r8oQoKN5FSM8gAM82zMqf59Fr8ZNDDjGCrotXdM="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/kdecoration-6.3.1.tar.xz",
+    "hash": "sha256-Ct+xvI7dkHqLOdiQjd9May0WvAMdMFsYw74QQZJiHUg="
   },
   "kdeplasma-addons": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/kdeplasma-addons-6.3.0.tar.xz",
-    "hash": "sha256-WZnR7hIK9Wc+cM8X8wMM5JK8zOeZfNTJLcBB+hgQmbk="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/kdeplasma-addons-6.3.1.tar.xz",
+    "hash": "sha256-aWzrQArHNGazMpcepOcPwLkT1w8YlDECiuS9HbIBBYo="
   },
   "kgamma": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/kgamma-6.3.0.tar.xz",
-    "hash": "sha256-yxNocFCZ9vbwmwjT+IVgHR9HkHSaK7xM6XdXTUTxcQI="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/kgamma-6.3.1.tar.xz",
+    "hash": "sha256-Tcj6WvP0ANV2HRMzycebZqJQdgF2TE3mSqe8XhOcDHQ="
   },
   "kglobalacceld": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/kglobalacceld-6.3.0.tar.xz",
-    "hash": "sha256-YSSYgpexkQhGtK8qApAraSM5g4NENBL0G5XMiL8N4LM="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/kglobalacceld-6.3.1.tar.xz",
+    "hash": "sha256-3cy7KJyr1on6srWuyxQ+kg+Xw6RE+A8/nEDbmb1GcYo="
   },
   "kinfocenter": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/kinfocenter-6.3.0.tar.xz",
-    "hash": "sha256-IPtgc2bRZjkNwYvsqPkyGBOSQwWgrf7pH3leTgXq0xE="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/kinfocenter-6.3.1.tar.xz",
+    "hash": "sha256-g3C63bXjiXacZRA9cQWs+tFaE7wSyY/jUakTJk/4WHw="
   },
   "kmenuedit": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/kmenuedit-6.3.0.tar.xz",
-    "hash": "sha256-9oK736Q25leu7LRh+doF1w5dbNsCNt/bcWNdMHcXRWM="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/kmenuedit-6.3.1.tar.xz",
+    "hash": "sha256-tOmL2pdwj267LqBqDLrmAC/JGLlLVYDNrb8DTmuvGfE="
   },
   "kpipewire": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/kpipewire-6.3.0.tar.xz",
-    "hash": "sha256-N38NIPvx84BzE28XtZlcg+XH+oClCJZtVp41xPGA3yo="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/kpipewire-6.3.1.tar.xz",
+    "hash": "sha256-L0I5TMQBg8GTxFFaFXLMg6ThUMdQwOOQJNSoV/eD2No="
   },
   "krdp": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/krdp-6.3.0.tar.xz",
-    "hash": "sha256-HpdFCwXazBteJamcSRVsQaGYZvsvGW7KHR4nWlfXJFA="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/krdp-6.3.1.tar.xz",
+    "hash": "sha256-DCDM8OpX/Z4n1CiMvAX0BvT2TQ3mSQ1NrVerF3qpjbE="
   },
   "kscreen": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/kscreen-6.3.0.tar.xz",
-    "hash": "sha256-Vtngpgfy+3mDEeFx32eykJZBf1BkLfhxCTflCvTR1/U="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/kscreen-6.3.1.tar.xz",
+    "hash": "sha256-sHz48SuraNNvu1YS9ePP/cnpqWZFSxxHt7N/t7zwQLI="
   },
   "kscreenlocker": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/kscreenlocker-6.3.0.tar.xz",
-    "hash": "sha256-rYa6DX3IdUql3YCXqyUojN+qRMAeMaEIE6tNDWmH9l4="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/kscreenlocker-6.3.1.tar.xz",
+    "hash": "sha256-xp/mipWGPq7kFA+Mx+Qsgyy8j2ENfGhyuGXIkFKQFOg="
   },
   "ksshaskpass": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/ksshaskpass-6.3.0.tar.xz",
-    "hash": "sha256-EXk3lsXE9ut7BgG8AD2Ezo5CFHvwUhLCpr0g38dKNiI="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/ksshaskpass-6.3.1.tar.xz",
+    "hash": "sha256-7MFsTcIxmK4CmPbT9B/NG90kwezOHoIqsKu6sPz8qx8="
   },
   "ksystemstats": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/ksystemstats-6.3.0.tar.xz",
-    "hash": "sha256-ZAr5jGsHagdDan1rka4wGOHlrImea4Q/BNSABZSydzo="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/ksystemstats-6.3.1.tar.xz",
+    "hash": "sha256-sISrYbK3O1HSJQvc/r5svL8/0PaltxQa0hGhQaZqTts="
   },
   "kwallet-pam": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/kwallet-pam-6.3.0.tar.xz",
-    "hash": "sha256-Gie/yXAB5MDFEg7sGjbTcwuqbvnfRPv2jyOjTNVRxn8="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/kwallet-pam-6.3.1.tar.xz",
+    "hash": "sha256-fo1V6tlAM9YRgZ1oyLnQFTX2i0a1hVytsYAU5PerRfw="
   },
   "kwayland": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/kwayland-6.3.0.tar.xz",
-    "hash": "sha256-L21ouJ2rIQN7puzJGmNT0fWjFPe4Bou25gW/XhtrJaw="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/kwayland-6.3.1.tar.xz",
+    "hash": "sha256-Ouk8BGplQl1xAgUWyjKtpdl7k+ekICODjHr9sx3SGmI="
   },
   "kwayland-integration": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/kwayland-integration-6.3.0.tar.xz",
-    "hash": "sha256-S8VCEZQ4TZvDfFRqKg85ZT6VdPK6FqnONqvoyctUOv0="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/kwayland-integration-6.3.1.tar.xz",
+    "hash": "sha256-oL+Xas3ZXJ6tYYBcVa/4lNYDB+0jdT4RJD4PzqyATeM="
   },
   "kwin": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/kwin-6.3.0.tar.xz",
-    "hash": "sha256-Gtl4/FKyG/3SGIQ1VKAVskaJ4MBJBNHLAOLkr8pPSvQ="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/kwin-6.3.1.tar.xz",
+    "hash": "sha256-mlC6DqpiCXg73vu2aOV9DL36cc6Ov70X/kRtttdz8kI="
   },
   "kwrited": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/kwrited-6.3.0.tar.xz",
-    "hash": "sha256-/H0YFVieKNBsbalnsYMSzlB+rMJ+9YG9rtwYNzm2Llw="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/kwrited-6.3.1.tar.xz",
+    "hash": "sha256-DxQuRQ4Qh0E3Ur4Z1OPdhnCAxegVbaKBIqdkD+zD2SU="
   },
   "layer-shell-qt": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/layer-shell-qt-6.3.0.tar.xz",
-    "hash": "sha256-oJiKEqI2ZM/jV7AHDT2Mrs6jsIiC7lIIalpONLiF1EM="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/layer-shell-qt-6.3.1.tar.xz",
+    "hash": "sha256-jhnqJly7pLAQ4tSZcUDgyaC7taEbUKzMi9Qzjnr36X8="
   },
   "libkscreen": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/libkscreen-6.3.0.tar.xz",
-    "hash": "sha256-nveR7vL1xulUKKnaP7c15NIjAIHFRyliyVyDU8AaZDo="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/libkscreen-6.3.1.tar.xz",
+    "hash": "sha256-hjJ+7bQsSmMuN2EWwo4QioH8oOxmWGiLoiqq5hZMiKI="
   },
   "libksysguard": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/libksysguard-6.3.0.tar.xz",
-    "hash": "sha256-vBu7OFslwGQj9vLQRLAMEGy9tVHFz4NIvVkixj1MvLk="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/libksysguard-6.3.1.tar.xz",
+    "hash": "sha256-wiPlKQVitSqRDHAmCzyiczRyjmpjWRHrZyaocucXi6Y="
   },
   "libplasma": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/libplasma-6.3.0.tar.xz",
-    "hash": "sha256-nCzelhWpQ5faaOQpMYJ2jh+9wvQZzbjwDosTo2bVl40="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/libplasma-6.3.1.tar.xz",
+    "hash": "sha256-ZFW0r/XYPxWGtLupf/qumziBtrAhguwVNfhy9/CPRgw="
   },
   "milou": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/milou-6.3.0.tar.xz",
-    "hash": "sha256-gbSDavVLQsHY3zJ1KgcIWtkYYjft2KQ0RV6qk9m9xpE="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/milou-6.3.1.tar.xz",
+    "hash": "sha256-pNC/qsu9K9UT4vew2Mu9eqFQnX/yKLjA4dGy5cHgKI0="
   },
   "ocean-sound-theme": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/ocean-sound-theme-6.3.0.tar.xz",
-    "hash": "sha256-g9nF9oc8uQ4tcepUVUh8QnN+BTUTOM7xnj+MrT68JNo="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/ocean-sound-theme-6.3.1.tar.xz",
+    "hash": "sha256-FwsjcbxKmhJj93hxSizL9Hr3xjtN6XWymwewNt387cE="
   },
   "oxygen": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/oxygen-6.3.0.tar.xz",
-    "hash": "sha256-SpCO5h552/wlIFJ8ZJPvuSeWVXUMxxXx4z2FKk8JaDQ="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/oxygen-6.3.1.tar.xz",
+    "hash": "sha256-lpa4pMtcz5N3yxpq0/4dgZG3ZPXPX9Ryb85dPQAAfr4="
   },
   "oxygen-sounds": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/oxygen-sounds-6.3.0.tar.xz",
-    "hash": "sha256-vqL+XEFKN65mnzmSLMutwUB3kkcEUpfsLQEfoX7MDys="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/oxygen-sounds-6.3.1.tar.xz",
+    "hash": "sha256-/vEbkcstwzACPIzqVNUg/AF7srpGzfNvUZKIfoku8L8="
   },
   "plasma-activities": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/plasma-activities-6.3.0.tar.xz",
-    "hash": "sha256-zLHKLcHeseI13UlvQjVfAFT1gGHs+adZ2fqgopmlbHs="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/plasma-activities-6.3.1.tar.xz",
+    "hash": "sha256-bh5PI/nos/je6pME3xF56jCwq2oRy59NfKIbFeV5Gm4="
   },
   "plasma-activities-stats": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/plasma-activities-stats-6.3.0.tar.xz",
-    "hash": "sha256-tKO4AhZgGP5NTTXNDXxBG1LRy3T/0iochOSUrTA1aC4="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/plasma-activities-stats-6.3.1.tar.xz",
+    "hash": "sha256-yAGQHGIUTzDs1+T3sXvI4FpFqxyz2AjI0KHVafAStaY="
   },
   "plasma-browser-integration": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/plasma-browser-integration-6.3.0.tar.xz",
-    "hash": "sha256-nF7TyOy+Co7PFpdBbL+fNBaUHp339avhebZnvYB4+20="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/plasma-browser-integration-6.3.1.tar.xz",
+    "hash": "sha256-kaSXmq4aChMZSLCz+JcIvREGsH59sPwdU708omjaYSc="
   },
   "plasma-desktop": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/plasma-desktop-6.3.0.tar.xz",
-    "hash": "sha256-u9v6h0tsBOO7M2g+oNCeMmFt6CfflqG2ZKILL1nWnQ4="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/plasma-desktop-6.3.1.tar.xz",
+    "hash": "sha256-EZydNhJ0NnBIMghky6/8YSUwy6TqYtbf1QTz7+WyVKQ="
   },
   "plasma-dialer": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/plasma-dialer-6.3.0.tar.xz",
-    "hash": "sha256-yVB0e4yD15DsY+5YXu0tMw10C3ZcYUFSPQlGNicgV6o="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/plasma-dialer-6.3.1.tar.xz",
+    "hash": "sha256-tAHrvzbg2H7Ahaks9jhi3Qtc+Q1arJf+MOuaoRglaY0="
   },
   "plasma-disks": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/plasma-disks-6.3.0.tar.xz",
-    "hash": "sha256-p2meDmgZMRlSw1FZE5xqESYS3fOVHrdC60zf+2rYbT0="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/plasma-disks-6.3.1.tar.xz",
+    "hash": "sha256-6ugUwDPoNzPwklsMvYpADX8wolJOl7IDJmlZazXmbL4="
   },
   "plasma-firewall": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/plasma-firewall-6.3.0.tar.xz",
-    "hash": "sha256-ll172oqLjZCW6UeLCcRqfR3Mh9z//tHCe3h3kdvjx/A="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/plasma-firewall-6.3.1.tar.xz",
+    "hash": "sha256-rSJxJsaGCJ+TadzMlCfAoLzED6bIbI38rmedhMY/Iz0="
   },
   "plasma-integration": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/plasma-integration-6.3.0.tar.xz",
-    "hash": "sha256-4IL0XHGAfkpBpf7g7uPyc0couMje0EHi+US3UwaGlDM="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/plasma-integration-6.3.1.tar.xz",
+    "hash": "sha256-RGVnVx3ItDRHt7ev17gtm6KmBCE5PIXLsQm7ZfVAqcI="
   },
   "plasma-mobile": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/plasma-mobile-6.3.0.tar.xz",
-    "hash": "sha256-tDkNwsSouZcT1FxR8kG3H/7RGLmKuJqsQND4sL07s5E="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/plasma-mobile-6.3.1.tar.xz",
+    "hash": "sha256-6pV4E9pESUQEIBNxnyjGYDAjcQaJd5Ohkq07SaC5aN8="
   },
   "plasma-nano": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/plasma-nano-6.3.0.tar.xz",
-    "hash": "sha256-q0uhUTOq8nPsHHkfw39FzjBPKH96FwaEn8TtrhtLHQM="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/plasma-nano-6.3.1.tar.xz",
+    "hash": "sha256-cnbTzAC4dhIm5Srj9L5MZnHnkckLtTNkMd46d0WZg18="
   },
   "plasma-nm": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/plasma-nm-6.3.0.tar.xz",
-    "hash": "sha256-IakXwSdy9+KBzi5rewgnN55E97VHomHfRhWdVy0NxeA="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/plasma-nm-6.3.1.tar.xz",
+    "hash": "sha256-r8cJO2AMMVzRr3UvitP3mVcxov/FL7ibB04vqIsAAGQ="
   },
   "plasma-pa": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/plasma-pa-6.3.0.tar.xz",
-    "hash": "sha256-3gT7Kgwe7H+Ek1DVoXyOhP+XLYILXjTTja4LiSJhae0="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/plasma-pa-6.3.1.tar.xz",
+    "hash": "sha256-tsXEATNDjxrqSrwoCNwgEl8d8XqUAVbOd65vGV1JtUg="
   },
   "plasma-sdk": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/plasma-sdk-6.3.0.tar.xz",
-    "hash": "sha256-PXXSJLK3p9ZcextB1NqxIizyXFnqTpwBcK23J9fvQWg="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/plasma-sdk-6.3.1.tar.xz",
+    "hash": "sha256-lVEIrjJz6aS87xadFbQCXPP6Dw1Pbgc2flbTlke09wk="
   },
   "plasma-systemmonitor": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/plasma-systemmonitor-6.3.0.tar.xz",
-    "hash": "sha256-/kZ/X+uSlaAtoQNTCYoC8wBWu5ZAFjV+LOTQwH0wXIg="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/plasma-systemmonitor-6.3.1.tar.xz",
+    "hash": "sha256-rgufAUhIlwE8Ds5NXy+wAj2ox/JDnCjtfPA5BJrXG7o="
   },
   "plasma-thunderbolt": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/plasma-thunderbolt-6.3.0.tar.xz",
-    "hash": "sha256-oMPbVanG0+QMf0t49iH2uF4R9mzPwEkTMzn7jJzh/mw="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/plasma-thunderbolt-6.3.1.tar.xz",
+    "hash": "sha256-2SE1dprNJtc2ZGcbJ1rdZXk0aCwJQmNkccU15K+8HxM="
   },
   "plasma-vault": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/plasma-vault-6.3.0.tar.xz",
-    "hash": "sha256-QU/lNg6xMv8kYyLs6aVkUEES+pWkxGKz8XK5hhPcJdg="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/plasma-vault-6.3.1.tar.xz",
+    "hash": "sha256-NmlP79pR3/5L2qU1Ba6JmFGOTHeu1Uc6F+wz7qKvYcQ="
   },
   "plasma-welcome": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/plasma-welcome-6.3.0.tar.xz",
-    "hash": "sha256-x+iEF4wc0aoKwmBzvZzxJNCjvjkmwCQLeXR3gGchGYQ="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/plasma-welcome-6.3.1.tar.xz",
+    "hash": "sha256-QNtYD3aSZXENGY12+Q34faxezQ8c+4RwyZyMPx/WKxs="
   },
   "plasma-workspace": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/plasma-workspace-6.3.0.tar.xz",
-    "hash": "sha256-FBZ9trlmsVZ7S4uPt77RjZUvK02UR7Uiij9aH7s4xDk="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/plasma-workspace-6.3.1.tar.xz",
+    "hash": "sha256-YX0qMjAwStou3Kx9h1nTZt2vmbWb2IU7zkcc9EuTQcU="
   },
   "plasma-workspace-wallpapers": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/plasma-workspace-wallpapers-6.3.0.tar.xz",
-    "hash": "sha256-1OhrrEgzpN8jmNCBXV+SwH6+W6+X2lIGP0b/XFEPEAo="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/plasma-workspace-wallpapers-6.3.1.tar.xz",
+    "hash": "sha256-9ElLw7vxa2dlfx/Pa/YmAr6m6ZSaTgQHRNVX5+F3xg8="
   },
   "plasma5support": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/plasma5support-6.3.0.tar.xz",
-    "hash": "sha256-uVIBaVez+AM9gfxY+QvxPwL5fuzWbKTmtrCAUHTKYoM="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/plasma5support-6.3.1.tar.xz",
+    "hash": "sha256-ZmOW904n3B+0Gqgvyv1aszyHjx6waueTxFviK3CmuWE="
   },
   "plymouth-kcm": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/plymouth-kcm-6.3.0.tar.xz",
-    "hash": "sha256-pGqGc06TgiXSh8HPpJnVv3jWzFsAjAxD45rdmvd3JS4="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/plymouth-kcm-6.3.1.tar.xz",
+    "hash": "sha256-FOGUUdBQ4LwAh7WB3T9n7rghmahyKjPfpjP4/BFW2RE="
   },
   "polkit-kde-agent-1": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/polkit-kde-agent-1-6.3.0.tar.xz",
-    "hash": "sha256-4H+0PlDvqaRZn/Eo7FExy75nBJ8b/yRnPOkfVbXkQes="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/polkit-kde-agent-1-6.3.1.tar.xz",
+    "hash": "sha256-+KzSVw3ok3YF1XFxAXiWV1uG8tXVbmCI7ec/EG2fC7I="
   },
   "powerdevil": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/powerdevil-6.3.0.tar.xz",
-    "hash": "sha256-y0y+bKuw6j0JipkQNcEc/BhNnJvQZfu6nvNPbAgsE6g="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/powerdevil-6.3.1.tar.xz",
+    "hash": "sha256-vG3tC8vCF+g9Eb6CcmqKc35+XzBB19F9PkCz7/ueY5E="
   },
   "print-manager": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/print-manager-6.3.0.tar.xz",
-    "hash": "sha256-wsR6LEvcOKMuzZaFbVvZzRa/UBFleeV1tbw6T3HHmAw="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/print-manager-6.3.1.tar.xz",
+    "hash": "sha256-Wr1OGleC5MMQnFqTLM0YOI7GuSqGYVcRfhwY0vzjCYA="
   },
   "qqc2-breeze-style": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/qqc2-breeze-style-6.3.0.tar.xz",
-    "hash": "sha256-6x7qYWDPcFIoeYt+zv/DVP1+k/saimSobl059T64on8="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/qqc2-breeze-style-6.3.1.tar.xz",
+    "hash": "sha256-KekUqfsUBVIEa/gUEpqGFcGM+08V2n+74bGeb4i9wlo="
   },
   "sddm-kcm": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/sddm-kcm-6.3.0.tar.xz",
-    "hash": "sha256-o44ChGGmqwQkF9GfLyTFufTEKDias3E4Rjb3C8q3dkw="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/sddm-kcm-6.3.1.tar.xz",
+    "hash": "sha256-jpz5ajBr/a5PHPV16X45Mw6k88526wkhZq3R/spcRgw="
   },
   "spacebar": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/spacebar-6.3.0.tar.xz",
-    "hash": "sha256-Q56khGQDJ4FyYYFITcXkHcAOhfQX7Sbf81XY/U+lW0k="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/spacebar-6.3.1.tar.xz",
+    "hash": "sha256-vy5JcIKk5bYpa4NZKYkNI9qbobPbSU+GEjfWlvbEmb8="
   },
   "spectacle": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/spectacle-6.3.0.tar.xz",
-    "hash": "sha256-voCrvB6AvESTcRCJWAqQWEhJlgiiSXvj1+uBy7+HYJk="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/spectacle-6.3.1.tar.xz",
+    "hash": "sha256-DzZLBd/MDGPB62luWTGPg6nIPUFi9WVrT6X+KdrMgU4="
   },
   "systemsettings": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/systemsettings-6.3.0.tar.xz",
-    "hash": "sha256-dxubbLveFf6GDKZewJo4xuF1yRSCnlVt5WwTYmkaxoA="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/systemsettings-6.3.1.tar.xz",
+    "hash": "sha256-DQMlonuIM5JbSGx8DtfKVvcflNH8ou6K/YyH7BJva28="
   },
   "wacomtablet": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/wacomtablet-6.3.0.tar.xz",
-    "hash": "sha256-wFdo6kWRe1WZojxYze8xzRIcQhOvD/xwDK8qGcvBWDU="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/wacomtablet-6.3.1.tar.xz",
+    "hash": "sha256-1jYb+u2eItJy9Di+5TY5GUvF+Z5Mb5E4Et9mTXGTdX8="
   },
   "xdg-desktop-portal-kde": {
-    "version": "6.3.0",
-    "url": "mirror://kde/stable/plasma/6.3.0/xdg-desktop-portal-kde-6.3.0.tar.xz",
-    "hash": "sha256-swz1cWaFvqkWG3rD3LqqMRVmJzmYUNdFksBunNTdD1E="
+    "version": "6.3.1",
+    "url": "mirror://kde/stable/plasma/6.3.1/xdg-desktop-portal-kde-6.3.1.tar.xz",
+    "hash": "sha256-/ynkBVLbb6tvJxf5dCtgWYPGqeDtvzYEId4ZADpelWc="
   }
 }
\ No newline at end of file
diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix
index 97906adebdfb..e213e27843f5 100644
--- a/pkgs/kde/plasma/kwin/default.nix
+++ b/pkgs/kde/plasma/kwin/default.nix
@@ -30,13 +30,6 @@ mkKdeDerivation {
     ./0003-plugins-qpa-allow-using-nixos-wrapper.patch
     ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
     ./0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch
-
-    # Backport recommended crash fix
-    # FIXME: remove in 6.3.1
-    (fetchpatch {
-      url = "https://invent.kde.org/plasma/kwin/-/commit/c97bc26ca9de8b1462f6ccb05fb2dafe01cd82cb.patch";
-      hash = "sha256-g8CsSKt3flTXAm80NbFuq+sT8l93mfyUBl2aBpP5zqY=";
-    })
   ];
 
   postPatch = ''
diff --git a/pkgs/kde/plasma/plasma-desktop/default.nix b/pkgs/kde/plasma/plasma-desktop/default.nix
index 7933541b4501..2a8e8df9d740 100644
--- a/pkgs/kde/plasma/plasma-desktop/default.nix
+++ b/pkgs/kde/plasma/plasma-desktop/default.nix
@@ -43,6 +43,11 @@ mkKdeDerivation {
     (replaceVars ./wallpaper-paths.patch {
       wallpapers = "${lib.getBin breeze}/share/wallpapers";
     })
+
+    # Fix build failure due to C++ template nonsense
+    # Submitted upstream: https://invent.kde.org/plasma/plasma-desktop/-/merge_requests/2833
+    # FIXME: remove when merged
+    ./fix-build.patch
   ];
 
   extraNativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/kde/plasma/plasma-desktop/fix-build.patch b/pkgs/kde/plasma/plasma-desktop/fix-build.patch
new file mode 100644
index 000000000000..9729ffb46bb5
--- /dev/null
+++ b/pkgs/kde/plasma/plasma-desktop/fix-build.patch
@@ -0,0 +1,107 @@
+diff --git a/kcms/libkwindevices/inputdevice.cpp b/kcms/libkwindevices/inputdevice.cpp
+index 9a437137077390a61152be96ac69b4f5e992d062..aea0952143a29a4b2bf06777f737a84cbd6e5b6d 100644
+--- a/kcms/libkwindevices/inputdevice.cpp
++++ b/kcms/libkwindevices/inputdevice.cpp
+@@ -10,44 +10,6 @@
+ 
+ #include "logging.h"
+ 
+-template<typename T>
+-bool InputDevice::Prop<T>::save()
+-{
+-    if (!isSupported() || !m_value || m_prop.isConstant()) {
+-        qCDebug(LIBKWINDEVICES) << "skipping" << this << m_value.has_value() << isSupported() << m_prop.name();
+-        return false;
+-    }
+-
+-    auto iface = m_device->m_iface.get();
+-    const bool ret = m_prop.write(iface, *m_value);
+-    if (ret) {
+-        m_configValue = *m_value;
+-    }
+-    return ret;
+-}
+-
+-template<typename T>
+-void InputDevice::Prop<T>::set(T newVal)
+-{
+-    if (!m_value) {
+-        value();
+-    }
+-
+-    Q_ASSERT(isSupported());
+-    if (m_value != newVal) {
+-        m_value = newVal;
+-        if (m_changedSignalFunction) {
+-            (m_device->*m_changedSignalFunction)();
+-        }
+-    }
+-}
+-
+-template<typename T>
+-bool InputDevice::Prop<T>::changed() const
+-{
+-    return m_value.has_value() && m_value.value() != m_configValue;
+-}
+-
+ InputDevice::InputDevice(const QString &dbusName, QObject *parent)
+     : QObject(parent)
+ {
+diff --git a/kcms/libkwindevices/inputdevice.h b/kcms/libkwindevices/inputdevice.h
+index 93f9753cfae3c8795c5493566f7e51c806710983..f5589b095f39aa76071f67b8ee544a71585a479a 100644
+--- a/kcms/libkwindevices/inputdevice.h
++++ b/kcms/libkwindevices/inputdevice.h
+@@ -269,12 +269,29 @@ private:
+             }
+         }
+ 
+-        void set(T newVal);
++        void set(T newVal) {
++            if (!m_value) {
++                value();
++            }
++        
++            Q_ASSERT(isSupported());
++            if (m_value != newVal) {
++                m_value = newVal;
++                if (m_changedSignalFunction) {
++                    (m_device->*m_changedSignalFunction)();
++                }
++            }
++        }
++
+         T defaultValue() const
+         {
+             return m_defaultValueFunction ? (m_device->m_iface.get()->*m_defaultValueFunction)() : T();
+         }
+-        bool changed() const;
++        
++        bool changed() const {
++            return m_value.has_value() && m_value.value() != m_configValue;
++        }
++
+         void set(const Prop<T> &p)
+         {
+             set(p.value());
+@@ -286,7 +303,20 @@ private:
+             return !m_supportedFunction || (iface->*m_supportedFunction)();
+         }
+ 
+-        bool save();
++        bool save() {
++            if (!isSupported() || !m_value || m_prop.isConstant()) {
++                qDebug() << "skipping" << this << m_value.has_value() << isSupported() << m_prop.name();
++                return false;
++            }
++        
++            auto iface = m_device->m_iface.get();
++            const bool ret = m_prop.write(iface, *m_value);
++            if (ret) {
++                m_configValue = *m_value;
++            }
++            return ret;
++        }
++
+         bool isDefaults() const
+         {
+             return m_value == defaultValue();

From 3b70ca57e3f59df509ed513c5e3a248d0d63d424 Mon Sep 17 00:00:00 2001
From: evils <30512529+evils@users.noreply.github.com>
Date: Tue, 18 Feb 2025 19:39:13 +0100
Subject: [PATCH 49/60] readexe: init at 0.1.3 (#247799)

---
 pkgs/by-name/re/readexe/package.nix | 31 +++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 pkgs/by-name/re/readexe/package.nix

diff --git a/pkgs/by-name/re/readexe/package.nix b/pkgs/by-name/re/readexe/package.nix
new file mode 100644
index 000000000000..6a0173652806
--- /dev/null
+++ b/pkgs/by-name/re/readexe/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "readexe";
+  version = "0.1.3";
+
+  src = fetchFromGitHub {
+    owner = "segin";
+    repo = "readexe";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-CT1EZQ3t7+5onmcUz5yGxDI24dyelUwYZFcL8YWZgPw=";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = with lib; {
+    description = "Reads out structural information on Microsoft .exe formats";
+    homepage = "https://github.com/segin/readexe";
+    license = with licenses; [
+      isc
+      bsd3
+    ];
+    maintainers = with maintainers; [ evils ];
+    mainProgram = "readexe";
+  };
+})

From cdf6aac5b5eedca56608c37548a1273014e73417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Boris=20Pr=C3=BC=C3=9Fmann?= <docbobo@pm.me>
Date: Tue, 18 Feb 2025 17:34:23 +0100
Subject: [PATCH 50/60] rmpc: 0.7.0 -> 0.8.0

---
 pkgs/by-name/rm/rmpc/package.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/rm/rmpc/package.nix b/pkgs/by-name/rm/rmpc/package.nix
index 4be8297ac6ba..f124d38c0dc7 100644
--- a/pkgs/by-name/rm/rmpc/package.nix
+++ b/pkgs/by-name/rm/rmpc/package.nix
@@ -9,17 +9,22 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rmpc";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "mierak";
     repo = "rmpc";
     rev = "v${version}";
-    hash = "sha256-IgkYUl1ccwzFgooqZGxmpJFzACEz3wmblostPsTnzSQ=";
+    hash = "sha256-RfYaWoVGdeE5y/hkRH+gZgnc0Hrp9V+Pttvjcu3Q14g=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-s8aXDDERy4IxUrXVEFMGny5B5HGE8xsi6I+b/HCHc6w=";
+  cargoHash = "sha256-m25lo7mufGS7m1QSnhYdXMaXfjdqtJ8hVLdbuRsxbKY=";
+
+  checkFlags = [
+    # Test currently broken, needs to be removed. See https://github.com/mierak/rmpc/issues/254
+    "--skip=core::scheduler::tests::interleaves_repeated_and_scheduled_jobs"
+  ];
 
   nativeBuildInputs = [
     installShellFiles

From 395e796b0b36bb27b6ae2dcfeb4fcdfc1a6ef5f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 18 Feb 2025 19:32:28 +0000
Subject: [PATCH 51/60] wiremock: 3.11.0 -> 3.12.0

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

diff --git a/pkgs/by-name/wi/wiremock/package.nix b/pkgs/by-name/wi/wiremock/package.nix
index f12271f0d84d..29d2dfd26ad5 100644
--- a/pkgs/by-name/wi/wiremock/package.nix
+++ b/pkgs/by-name/wi/wiremock/package.nix
@@ -10,11 +10,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "wiremock";
-  version = "3.11.0";
+  version = "3.12.0";
 
   src = fetchurl {
     url = "mirror://maven/org/wiremock/wiremock-standalone/${finalAttrs.version}/wiremock-standalone-${finalAttrs.version}.jar";
-    hash = "sha256-hfR+7NVN32qidcmjzq+OIAytMNJrUppwbdVeO/OkeH4=";
+    hash = "sha256-xBylDIazUsvIVGitrdF/cdHiTm3N4yh032sPESmfe0E=";
   };
 
   dontUnpack = true;

From 98c0410b9d35146408878f4ab1e3c6f16bf8c2e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 16 Feb 2025 00:41:24 +0000
Subject: [PATCH 52/60] conftest: 0.56.0 -> 0.57.0

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

diff --git a/pkgs/by-name/co/conftest/package.nix b/pkgs/by-name/co/conftest/package.nix
index 34b5a95e295d..08b74ca8e982 100644
--- a/pkgs/by-name/co/conftest/package.nix
+++ b/pkgs/by-name/co/conftest/package.nix
@@ -7,15 +7,15 @@
 
 buildGoModule rec {
   pname = "conftest";
-  version = "0.56.0";
+  version = "0.57.0";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "conftest";
     tag = "v${version}";
-    hash = "sha256-7R6qMjwPtlpnsm6xej7jQntv9709//q4VVbatuzLuwk=";
+    hash = "sha256-Cr0TFPs4VHvLdSdlASxz1dbeXwBkIBruCl4Ui5VNCcc=";
   };
-  vendorHash = "sha256-QPFLHP4nyJqB7tVVk00J+V+1YXGSsRvCZ1aLEMg0kfc=";
+  vendorHash = "sha256-bQl2jyBM0ebv7m1Y/OFXFPnXodv1GxyrwXuPfcyVsPM=";
 
   ldflags = [
     "-s"

From a283ed4c75b930e51fb138640a4efb3558bbb7d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 9 Feb 2025 14:04:27 +0000
Subject: [PATCH 53/60] kubernetes-helmPlugins.helm-unittest: 0.7.1 -> 0.7.2

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

diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
index 7d06c2a6f6d6..3aa5904f0a20 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "helm-unittest";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-TZ2qY0aJHIJq9gd522NJyNkUDYQuICyTsUnQBf34Pq0=";
+    hash = "sha256-RWucFZlyVYV5pHFGP7x5I+SILAJ9k12R7l5o7WKGS/c=";
   };
 
-  vendorHash = "sha256-kMQIXN7Qu39MUFUHtLl1vnNv2qOUUcDhGes1MJ2Nh64=";
+  vendorHash = "sha256-tTM9n/ahtAJoQt0fwf1jrSokWER+cOnpPX7NTNrhKc4=";
 
   # NOTE: Remove the install and upgrade hooks.
   postPatch = ''

From d68c3095d2d666f35654b332650cd10c6dff8dfb Mon Sep 17 00:00:00 2001
From: Ludovico Piero <lewdovico@gnuweeb.org>
Date: Wed, 19 Feb 2025 06:09:11 +0900
Subject: [PATCH 54/60] ytmdesktop: 2.0.6 -> 2.0.7

Changelog: github.com/ytmdesktop/ytmdesktop/releases/tag/v2.0.7
Closes #383172

Signed-off-by: Ludovico Piero <lewdovico@gnuweeb.org>
---
 pkgs/by-name/yt/ytmdesktop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/yt/ytmdesktop/package.nix b/pkgs/by-name/yt/ytmdesktop/package.nix
index b1df83104aa2..d5e537c4d43d 100644
--- a/pkgs/by-name/yt/ytmdesktop/package.nix
+++ b/pkgs/by-name/yt/ytmdesktop/package.nix
@@ -12,7 +12,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "ytmdesktop";
-  version = "2.0.6";
+  version = "2.0.7";
 
   desktopItems = [
     (makeDesktopItem {
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://github.com/ytmdesktop/ytmdesktop/releases/download/v${finalAttrs.version}/youtube-music-desktop-app_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-uLTnVA9ooGlbtmUGoYtrT9IlOhTAJpEXMr1GSs3ae/8=";
+    hash = "sha256-bdP6vIAUoFYLvEvxtG69tBuL94EQQVwNyeuQibRMMbk=";
   };
 
   unpackPhase = ''
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     asar extract resources/app.asar patched-asar
 
     # workaround for https://github.com/electron/electron/issues/31121
-    substituteInPlace patched-asar/.webpack/main/index.js \
+    substituteInPlace patched-asar/.vite/main/index.js \
       --replace-fail "process.resourcesPath" "'$out/lib/resources'"
 
     asar pack patched-asar resources/app.asar

From 937fba9c5e53ad6e30bdf748ce054c6699d65d05 Mon Sep 17 00:00:00 2001
From: Marcus Ramberg <marcus@means.no>
Date: Tue, 18 Feb 2025 22:36:37 +0100
Subject: [PATCH 55/60] gurk-rs: 0.6.1 -> 0.6.2

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

diff --git a/pkgs/by-name/gu/gurk-rs/package.nix b/pkgs/by-name/gu/gurk-rs/package.nix
index 172490f3a449..a26e7fc32de1 100644
--- a/pkgs/by-name/gu/gurk-rs/package.nix
+++ b/pkgs/by-name/gu/gurk-rs/package.nix
@@ -18,13 +18,13 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "gurk-rs";
-  version = "0.6.1";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "boxdot";
     repo = "gurk-rs";
     tag = "v${version}";
-    hash = "sha256-cNKUQlCzhOgyWoitHjRoVdehj8AUEslHBCGxH9nRWF4=";
+    hash = "sha256-FSnKBSRhnHwjMzC8zGU/AHBuPX44EjMLS+3wHkf6IZw=";
   };
 
   postPatch = ''
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-eh7ZD8ZX1oKiJbJcVtk6pczb6HxNM6md93P/22Qn5u0=";
+  cargoHash = "sha256-6+AFyQjbtxKHbMhYhfu9pUoz/cWGtl5o+IA6kFO4Zjk=";
 
   nativeBuildInputs = [
     protobuf

From 954f98d37cde9f2279f4a69f477b77da5c8ca3bb Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 18 Feb 2025 22:38:58 +0100
Subject: [PATCH 56/60] lexical: 0.7.2 -> 0.7.3

Diff: https://github.com/lexical-lsp/lexical/compare/refs/tags/v0.7.2...v0.7.3

Changelog: https://github.com/lexical-lsp/lexical/releases/tag/v0.7.3
---
 pkgs/by-name/le/lexical/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/le/lexical/package.nix b/pkgs/by-name/le/lexical/package.nix
index e89199f6e416..dbdbfa298ae0 100644
--- a/pkgs/by-name/le/lexical/package.nix
+++ b/pkgs/by-name/le/lexical/package.nix
@@ -9,19 +9,19 @@
 
 beamPackages.mixRelease rec {
   pname = "lexical";
-  version = "0.7.2";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "lexical-lsp";
     repo = "lexical";
     tag = "v${version}";
-    hash = "sha256-mgchXc46sMN1UcgyO8uWusl2bEJr/5PqfwJ2c6j6SoI=";
+    hash = "sha256-p8XSJBX1igwC+ssEJGD8wb/ZYaEgLGozlY8N6spo3cA=";
   };
 
   mixFodDeps = beamPackages.fetchMixDeps {
     inherit pname version src;
 
-    hash = "sha256-Ee8RbLkb7jkdK91G4TAUIlPthBP5OyeynHJGg87UvBI=";
+    hash = "sha256-g6BZGJ33oBDXmjbb/kBfPhart4En/iDlt4yQJYeuBzw=";
   };
 
   installPhase = ''

From 76de542f6606efe5d147392b17ab4148070b654a Mon Sep 17 00:00:00 2001
From: Joshua Trees <jtrees@users.noreply.github.com>
Date: Tue, 18 Feb 2025 22:48:30 +0100
Subject: [PATCH 57/60] android-backup-extractor: 20210909062443-4c55371 ->
 0-unstable-2025-01-15-62310d4 (#379853)

android-backup-extractor: update to latest version
---
 pkgs/by-name/an/android-backup-extractor/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/an/android-backup-extractor/package.nix b/pkgs/by-name/an/android-backup-extractor/package.nix
index 61d8f55ea538..99cb71e60bd0 100644
--- a/pkgs/by-name/an/android-backup-extractor/package.nix
+++ b/pkgs/by-name/an/android-backup-extractor/package.nix
@@ -6,13 +6,13 @@
   jre,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "android-backup-extractor";
-  version = "20210909062443-4c55371";
+  version = "0-unstable-2025-01-15-62310d4";
 
   src = fetchurl {
-    url = "https://github.com/nelenkov/android-backup-extractor/releases/download/${version}/abe.jar";
-    sha256 = "0ms241kb4h9y9apr637sb4kw5mml40c1ac0q4jcxhnwr3dr05w1q";
+    url = "https://github.com/nelenkov/android-backup-extractor/releases/download/latest/abe-62310d4.jar";
+    hash = "sha256-KY85I8OJCH7z6U6y9UbelFb3rvBVCid+AjJcucNGLdA=";
   };
 
   dontUnpack = true;

From eca34552eb2485bf9876ce1ec203fbfe9a2b63e3 Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Tue, 18 Feb 2025 17:05:11 +0100
Subject: [PATCH 58/60] coqPackages.coq-elpi: rstore overridability on Coq <
 9.0

---
 .../coq-modules/coq-elpi/default.nix          | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix
index 9fe57b01822c..815e792d4b38 100644
--- a/pkgs/development/coq-modules/coq-elpi/default.nix
+++ b/pkgs/development/coq-modules/coq-elpi/default.nix
@@ -132,9 +132,9 @@ patched-derivation3 = patched-derivation2.overrideAttrs
 patched-derivation4 = patched-derivation3.overrideAttrs
   (
     o:
-    # this is just a wrapper for rocPackages.bignums for Rocq >= 9.0
-    lib.optionalAttrs (coq.version != null && (coq.version == "dev"
-                       || lib.versions.isGe "9.0" coq.version)) {
+    # this is just a wrapper for rocPackages.rocq-elpi for Rocq >= 9.0
+    if coq.version != null && (coq.version == "dev"
+                               || lib.versions.isGe "9.0" coq.version) then {
       configurePhase = ''
         echo no configuration
       '';
@@ -146,6 +146,19 @@ patched-derivation4 = patched-derivation3.overrideAttrs
       '';
       propagatedBuildInputs = o.propagatedBuildInputs
         ++ [ rocqPackages.rocq-elpi ];
+    } else lib.optionalAttrs (o.version != null && (o.version == "dev"
+                              || lib.versions.isGe "2.5.0" o.version)) {
+      configurePhase = ''
+        make dune-files || true
+      '';
+      buildPhase = ''
+        dune build -p rocq-elpi @install ''${enableParallelBuilding:+-j $NIX_BUILD_CORES}
+      '';
+      installPhase = ''
+        dune install --root . rocq-elpi --prefix=$out --libdir $OCAMLFIND_DESTDIR
+        mkdir $out/lib/coq/
+        mv $OCAMLFIND_DESTDIR/coq $out/lib/coq/${coq.coq-version}
+      '';
     }
   );
 in patched-derivation4

From e9422823b88e174b694c8bdbd5b4dddac60a7ee6 Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Tue, 18 Feb 2025 17:05:41 +0100
Subject: [PATCH 59/60] coqPackages.coqeal: 2.0.3 -> 2.1.0

---
 .../coq-modules/coqeal/default.nix            | 81 +++----------------
 1 file changed, 13 insertions(+), 68 deletions(-)

diff --git a/pkgs/development/coq-modules/coqeal/default.nix b/pkgs/development/coq-modules/coqeal/default.nix
index d748b956c42b..bc658fcfa7ed 100644
--- a/pkgs/development/coq-modules/coqeal/default.nix
+++ b/pkgs/development/coq-modules/coqeal/default.nix
@@ -18,75 +18,20 @@ derivation = mkCoqDerivation {
   inherit version;
   defaultVersion =
     with lib.versions;
-    lib.switch
-      [ coq.version mathcomp.version ]
-      [
-        {
-          cases = [
-            (range "8.16" "8.20")
-            (isGe "2.1.0")
-          ];
-          out = "2.0.3";
-        }
-        {
-          cases = [
-            (range "8.16" "8.20")
-            (isGe "2.0.0")
-          ];
-          out = "2.0.1";
-        }
-        {
-          cases = [
-            (range "8.16" "8.17")
-            (isGe "2.0.0")
-          ];
-          out = "2.0.0";
-        }
-        {
-          cases = [
-            (range "8.15" "8.18")
-            (range "1.15.0" "1.18.0")
-          ];
-          out = "1.1.3";
-        }
-        {
-          cases = [
-            (range "8.13" "8.17")
-            (range "1.13.0" "1.18.0")
-          ];
-          out = "1.1.1";
-        }
-        {
-          cases = [
-            (range "8.10" "8.15")
-            (range "1.12.0" "1.18.0")
-          ];
-          out = "1.1.0";
-        }
-        {
-          cases = [
-            (isGe "8.10")
-            (range "1.11.0" "1.12.0")
-          ];
-          out = "1.0.5";
-        }
-        {
-          cases = [
-            (isGe "8.7")
-            "1.11.0"
-          ];
-          out = "1.0.4";
-        }
-        {
-          cases = [
-            (isGe "8.7")
-            "1.10.0"
-          ];
-          out = "1.0.3";
-        }
-      ]
-      null;
+    lib.switch [ coq.version mathcomp.version ] [
+      { cases = [ (range "9.0" "9.0") (isGe "2.3.0") ]; out = "2.1.0"; }
+      { cases = [ (range "8.16" "8.20") (isGe "2.1.0") ]; out = "2.0.3"; }
+      { cases = [ (range "8.16" "8.20") (isGe "2.0.0") ]; out = "2.0.1"; }
+      { cases = [ (range "8.16" "8.17") (isGe "2.0.0") ]; out = "2.0.0"; }
+      { cases = [ (range "8.15" "8.18") (range "1.15.0" "1.18.0") ]; out = "1.1.3"; }
+      { cases = [ (range "8.13" "8.17") (range "1.13.0" "1.18.0") ]; out = "1.1.1"; }
+      { cases = [ (range "8.10" "8.15") (range "1.12.0" "1.18.0") ]; out = "1.1.0"; }
+      { cases = [ (isGe "8.10") (range "1.11.0" "1.12.0") ]; out = "1.0.5"; }
+      { cases = [ (isGe "8.7") "1.11.0" ]; out = "1.0.4"; }
+      { cases = [ (isGe "8.7") "1.10.0" ]; out = "1.0.3"; }
+    ] null;
 
+  release."2.1.0".sha256 = "sha256-UoDxy2BKraDyRsO42GXRo26O74OF51biZQGkIMWLf8Y=";
   release."2.0.3".sha256 = "sha256-5lDq7IWlEW0EkNzYPu+dA6KOvRgy53W/alikpDr/Kd0=";
   release."2.0.1".sha256 = "sha256-d/IQ4IdS2tpyPewcGobj2S6m2HU+iXQmlvR+ITNIcjI=";
   release."2.0.0".sha256 = "sha256-SG/KVnRJz2P+ZxkWVp1dDOnc/JVgigoexKfRUh1Y0GM";

From 5cf57e19690d06e4ff1a129ef8075f7ef5e18446 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Wed, 19 Feb 2025 07:20:43 +1100
Subject: [PATCH 60/60] python312Packages.blosc2: make torch tests optional,
 enabled by default

Update pkgs/development/python-modules/blosc2/default.nix

Co-authored-by: Nick Cao <nickcao@nichi.co>
---
 pkgs/development/python-modules/blosc2/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/blosc2/default.nix b/pkgs/development/python-modules/blosc2/default.nix
index 611303a52016..e0dfb4974072 100644
--- a/pkgs/development/python-modules/blosc2/default.nix
+++ b/pkgs/development/python-modules/blosc2/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -24,6 +25,8 @@
   # tests
   psutil,
   pytestCheckHook,
+  torch,
+  runTorchTests ? lib.meta.availableOn stdenv.hostPlatform torch,
 }:
 
 buildPythonPackage rec {
@@ -68,7 +71,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     psutil
     pytestCheckHook
-  ];
+  ] ++ lib.optionals runTorchTests [ torch ];
 
   disabledTests = [
     # RuntimeError: Error while getting the slice