From 7643346e5363c389dec0f114feb075ee51b0cc0e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 25 Mar 2025 12:44:49 +0000
Subject: [PATCH 01/48] capstone: 5.0.5 -> 5.0.6

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

diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix
index 154999badf58..df84133c6e5c 100644
--- a/pkgs/development/libraries/capstone/default.nix
+++ b/pkgs/development/libraries/capstone/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "capstone";
-  version = "5.0.5";
+  version = "5.0.6";
 
   src = fetchFromGitHub {
     owner = "capstone-engine";
     repo = "capstone";
     rev = version;
-    hash = "sha256-VGqqrixg7LaqRWTAEBzpC+gUTchncz3Oa2pSq8GLskI=";
+    hash = "sha256-ovIvsxVq+/q5UUMzP4WpxzaE0898uayNc1g2Coignnc=";
   };
 
   cmakeFlags =

From 63b841db767c8f0a051bdd19b2513c060f20c27e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 00:32:55 +0000
Subject: [PATCH 02/48] deadbeef: 1.9.6 -> 1.10.0

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

diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index 537ed9880665..222dfa3acb4e 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -70,7 +70,7 @@ assert gtk2Support || gtk3Support;
 let
   inherit (lib) optionals;
 
-  version = "1.9.6";
+  version = "1.10.0";
 in
 clangStdenv.mkDerivation {
   pname = "deadbeef";
@@ -81,7 +81,7 @@ clangStdenv.mkDerivation {
     repo = "deadbeef";
     fetchSubmodules = true;
     rev = version;
-    hash = "sha256-Q6hL4fOFPHn26ZqvrebgTMTgQZrhbXCEhM4ZFzNeyJE=";
+    hash = "sha256-qa0ULmE15lV2vkyXPNW9kSISQZEANrjwJwykTiifk5Q=";
   };
 
   buildInputs =

From f88b8a6d29841ef0dfa7bb0e8ae1640752f084ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 00:50:08 +0000
Subject: [PATCH 03/48] lightburn: 1.7.07 -> 1.7.08

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

diff --git a/pkgs/by-name/li/lightburn/package.nix b/pkgs/by-name/li/lightburn/package.nix
index 95ce9327b1fb..df15a74ba638 100644
--- a/pkgs/by-name/li/lightburn/package.nix
+++ b/pkgs/by-name/li/lightburn/package.nix
@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation rec {
   pname = "lightburn";
-  version = "1.7.07";
+  version = "1.7.08";
 
   src = fetchurl {
     url = "https://release.lightburnsoftware.com/LightBurn/Release/LightBurn-v${version}/LightBurn-Linux64-v${version}.7z";
-    hash = "sha256-MFv+y1GVoio4ok7negpX4ABaya7Z+s8zqM85YhOFxVo=";
+    hash = "sha256-dG/A39/SapyS6GGSKCsHUvYN+CONul/s55HTi9Cc59g=";
   };
 
   nativeBuildInputs = [

From a069316447dc81a7553bbc90fc140113d8b0cba3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 05:06:07 +0000
Subject: [PATCH 04/48] bind: 9.20.6 -> 9.20.7

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

diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix
index 23426039e3c4..c7220e10e5d7 100644
--- a/pkgs/by-name/bi/bind/package.nix
+++ b/pkgs/by-name/bi/bind/package.nix
@@ -28,11 +28,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bind";
-  version = "9.20.6";
+  version = "9.20.7";
 
   src = fetchurl {
     url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
-    hash = "sha256-7X9UtE+EpyAaL6epSfMCHqVoUpv62Q/KZk/VXAUQQTQ=";
+    hash = "sha256-QzI8jSLSFEKCw3tAYOwR6Ywkg14iVoiHb60IunuV3KY=";
   };
 
   outputs = [

From a25e299909164a1d6a4754d2048b53d4b45fcebd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Mar 2025 06:16:48 +0000
Subject: [PATCH 05/48] git-repo: 2.52 -> 2.53

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

diff --git a/pkgs/by-name/gi/git-repo/package.nix b/pkgs/by-name/gi/git-repo/package.nix
index 337821cb3777..28766f08da6a 100644
--- a/pkgs/by-name/gi/git-repo/package.nix
+++ b/pkgs/by-name/gi/git-repo/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "git-repo";
-  version = "2.52";
+  version = "2.53";
 
   src = fetchFromGitHub {
     owner = "android";
     repo = "tools_repo";
     rev = "v${version}";
-    hash = "sha256-x8i09tqxfwek6z351ZJ2l/CdTx1p2EtbHX38Lu8mge0=";
+    hash = "sha256-mPmOnq9j9vnfTynGbOoChLslpyTpIzH6+B2fv5PTHZY=";
   };
 
   # Fix 'NameError: name 'ssl' is not defined'

From 75f5785c5064e5e581d6c664db8b54d87af21432 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 28 Mar 2025 22:37:10 +0000
Subject: [PATCH 06/48] cpuinfo: 0-unstable-2025-02-19 -> 0-unstable-2025-03-27

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

diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix
index f55460cb8a7a..76022e1a95c1 100644
--- a/pkgs/by-name/cp/cpuinfo/package.nix
+++ b/pkgs/by-name/cp/cpuinfo/package.nix
@@ -10,13 +10,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "cpuinfo";
-  version = "0-unstable-2025-02-19";
+  version = "0-unstable-2025-03-27";
 
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "cpuinfo";
-    rev = "b73ae6ce38d5dd0b7fe46dbe0a4b5f4bab91c7ea";
-    hash = "sha256-JNLaK105qDk9DxTqCFyXFfYn46dF+nZIaF5urSVRa0U=";
+    rev = "39ea79a3c132f4e678695c579ea9353d2bd29968";
+    hash = "sha256-uochXC0AtOw8N/ycyVJdiRw4pibCW2ENrFMT3jtxDSg=";
   };
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };

From 28fd155779fc75125fdaaf541d18ea7919d9208d Mon Sep 17 00:00:00 2001
From: Silvio Ankermann <silvio@booq.org>
Date: Sat, 29 Mar 2025 02:47:30 +0100
Subject: [PATCH 07/48] python3Packages.kubernetes-validate: 0.31.0 -> 0.32.0

Switch src to Pypi because the tags on GitHub don't seem to be
updated anymore.

Remove pytestCheckHook because Pypi tarball doesn't contain tests.
---
 pkgs/by-name/ku/kubernetes-validate/unwrapped.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix b/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix
index 6f3cd6d0fa44..300e9f27637e 100644
--- a/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix
+++ b/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchFromGitHub,
+  fetchPypi,
   setuptools,
   importlib-resources,
   jsonschema,
@@ -14,14 +14,13 @@
 }:
 buildPythonPackage rec {
   pname = "kubernetes-validate";
-  version = "1.31.0";
+  version = "1.32.0";
   pyproject = true;
 
-  src = fetchFromGitHub {
-    owner = "willthames";
-    repo = "kubernetes-validate";
-    tag = "v${version}";
-    hash = "sha256-vxsftuipw0rHQIngxKlPHwBIW+rYAjfnEEaJDKmPyfQ=";
+  src = fetchPypi {
+    pname = "kubernetes_validate";
+    inherit version;
+    hash = "sha256-GSg3/cLBkWUlAf4mjdo0JT36yuADRQWlGwo4hNFZNh0=";
   };
 
   build-system = [
@@ -38,7 +37,6 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    pytestCheckHook
     versionCheckHook
   ];
   versionCheckProgramArg = [ "--version" ];

From 7dc56449ad7c4ad3b053cf5393c6d4cabf76bad0 Mon Sep 17 00:00:00 2001
From: Nico Felbinger <nico@felbinger.eu>
Date: Sat, 8 Mar 2025 23:44:11 +0100
Subject: [PATCH 08/48] nixos/modules: fix part-db package

---
 nixos/modules/services/web-apps/part-db.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/part-db.nix b/nixos/modules/services/web-apps/part-db.nix
index c165969aa620..85adf2d7b7e5 100644
--- a/nixos/modules/services/web-apps/part-db.nix
+++ b/nixos/modules/services/web-apps/part-db.nix
@@ -27,7 +27,7 @@ in
     phpPackage = mkPackageOption pkgs "php" { } // {
       apply =
         pkg:
-        pkg.override {
+        pkg.buildEnv {
           extraConfig = ''
             memory_limit = 256M;
           '';

From 0ed3f062484dc73009969cab9bff0f4dcb88f3d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 31 Mar 2025 00:50:31 +0000
Subject: [PATCH 09/48] gsasl: 2.2.1 -> 2.2.2

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

diff --git a/pkgs/by-name/gs/gsasl/package.nix b/pkgs/by-name/gs/gsasl/package.nix
index 714423ee2738..eb7fccdd294f 100644
--- a/pkgs/by-name/gs/gsasl/package.nix
+++ b/pkgs/by-name/gs/gsasl/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gsasl";
-  version = "2.2.1";
+  version = "2.2.2";
 
   src = fetchurl {
     url = "mirror://gnu/gsasl/gsasl-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-1FtWLhO9E7n8ILNy9LUyaXQM9iefg28JzhG50yvO4HU=";
+    sha256 = "sha256-QejkQmSOzK9kWdmtk9SxhTC5bI6vUOPzQlMu8nXv87o=";
   };
 
   buildInputs = [

From d139cb66504c697a6f3034807fa77ebd042430a9 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 2 Apr 2025 20:45:51 +0100
Subject: [PATCH 10/48] mdbook: 0.4.47 -> 0.4.48

Changes: https://github.com/rust-lang/mdBook/blob/master/CHANGELOG.md#mdbook-0448
---
 pkgs/by-name/md/mdbook/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix
index 21d3dd72fba7..2840a37eb50b 100644
--- a/pkgs/by-name/md/mdbook/package.nix
+++ b/pkgs/by-name/md/mdbook/package.nix
@@ -9,7 +9,7 @@
   installShellFiles,
 }:
 let
-  version = "0.4.47";
+  version = "0.4.48";
 in
 rustPlatform.buildRustPackage rec {
   inherit version;
@@ -19,11 +19,11 @@ rustPlatform.buildRustPackage rec {
     owner = "rust-lang";
     repo = "mdBook";
     tag = "v${version}";
-    hash = "sha256-XTvC2pGRVat0kOybNb9TziG32wDVexnFx2ahmpUFmaA=";
+    hash = "sha256-ZCV8BSoaYIhNZV3Spsd7rsp8D2zTZSdWMuicQrgax2I=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-ASPRBAB+elJuyXpPQBm3WI97wD3mjoO1hw0fNHc+KAw=";
+  cargoHash = "sha256-ZpfzAzqVL7/GaI4C7X0UqZAPFT/Y/OCQ53wDcmgM2zI=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From f19c1b2c1c590caed67fb16b98ebdf5572a61005 Mon Sep 17 00:00:00 2001
From: Nico Felbinger <nico@felbinger.eu>
Date: Tue, 25 Mar 2025 17:45:29 +0100
Subject: [PATCH 11/48] python312Packages.netbox-attachments: init at 7.1.0

---
 .../netbox-attachments/default.nix            | 41 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/python-modules/netbox-attachments/default.nix

diff --git a/pkgs/development/python-modules/netbox-attachments/default.nix b/pkgs/development/python-modules/netbox-attachments/default.nix
new file mode 100644
index 000000000000..0834a42ab082
--- /dev/null
+++ b/pkgs/development/python-modules/netbox-attachments/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  pythonAtLeast,
+  fetchFromGitHub,
+  setuptools,
+  netbox,
+}:
+buildPythonPackage rec {
+  pname = "netbox-attachments";
+  version = "7.1.0";
+  pyproject = true;
+
+  disabled = pythonAtLeast "3.13";
+
+  src = fetchFromGitHub {
+    owner = "Kani999";
+    repo = "netbox-attachments";
+    tag = version;
+    hash = "sha256-uSp6z2jSb+kX5YspIV0essqRHGtOlZ5m0hMS6OO9Trk=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ netbox ];
+
+  preFixup = ''
+    export PYTHONPATH=${netbox}/opt/netbox/netbox:$PYTHONPATH
+  '';
+
+  pythonImportsCheck = [ "netbox_attachments" ];
+
+  meta = {
+    description = "Plugin to manage attachments for any model";
+    homepage = "https://github.com/Kani999/netbox-attachments";
+    changelog = "https://github.com/Kani999/netbox-attachments/releases/tag/${src.tag}";
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ felbinger ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9abac7174fad..7bd6ccf851a1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10389,6 +10389,8 @@ self: super: with self; {
 
   netapp-ontap = callPackage ../development/python-modules/netapp-ontap { };
 
+  netbox-attachments = callPackage ../development/python-modules/netbox-attachments { };
+
   netbox-bgp = callPackage ../development/python-modules/netbox-bgp { };
 
   netbox-contract = callPackage ../development/python-modules/netbox-contract { };

From 09577240c216f3c385ddb01293cf56571a3b8665 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Sat, 5 Apr 2025 13:26:55 +0900
Subject: [PATCH 12/48] deno: 2.2.6 -> 2.2.8

https://github.com/denoland/deno/releases/tag/v2.2.7
https://github.com/denoland/deno/releases/tag/v2.2.8

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/de/deno/librusty_v8.nix | 10 +++++-----
 pkgs/by-name/de/deno/package.nix     |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/de/deno/librusty_v8.nix b/pkgs/by-name/de/deno/librusty_v8.nix
index 68c42657c851..fbd9f29aac67 100644
--- a/pkgs/by-name/de/deno/librusty_v8.nix
+++ b/pkgs/by-name/de/deno/librusty_v8.nix
@@ -2,11 +2,11 @@
 { fetchLibrustyV8 }:
 
 fetchLibrustyV8 {
-  version = "135.0.0";
+  version = "135.1.0";
   shas = {
-    x86_64-linux = "sha256-jA/cUjzT3KhpBGFyxZSp61X05PhD6XKAGtZyKdnts7U=";
-    aarch64-linux = "sha256-+jqLUIv96994e1fFJcYCQNJJ8smF18sU76lq0sirszo=";
-    x86_64-darwin = "sha256-atemob6PgxMncD4F+b5mfleTHSTMdKvJAwFD9ul/eJ4=";
-    aarch64-darwin = "sha256-0fDaHgvUTDFKEhQp7WaNe+54e3+GScGO5+8+Qa89nLQ=";
+    x86_64-linux = "sha256-QGpFNkVHO9j4uagYNC5X3JVif80RVazp63oqrdWYUoU=";
+    aarch64-linux = "sha256-J4E32qZNyqmJyFKBuU+6doRYL3ZSaEMSBlML+hSkj+o=";
+    x86_64-darwin = "sha256-UnulsDS1LlrVR2+cz+4zgWxKqbkB5ch3T9UofGCZduQ=";
+    aarch64-darwin = "sha256-mU7N/1vXzCP+mwjzLTsDkT+8YOJifwNju3Rv9Cq5Loo=";
   };
 }
diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index a63f31cb5090..cf4b6c66bc0e 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -20,17 +20,17 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "deno";
-  version = "2.2.6";
+  version = "2.2.8";
 
   src = fetchFromGitHub {
     owner = "denoland";
     repo = "deno";
     tag = "v${version}";
-    hash = "sha256-Ner3178YukKKqMVQAGpU3bE+fxo9UXrRPp7iqCFSUjs=";
+    hash = "sha256-pGhqfQR+42XUY0v99fvSyLQPlvzCWntq4qS9vyuJEpY=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-dakHDPGv7trd2Kib9Hk5jHZHR3pzk1YIyJW/0uY6WSg=";
+  cargoHash = "sha256-FJ3wPkL1Pgw6S66n5hyQfUZWTVXs4oZ0bJJaN22OxoY=";
 
   postPatch = ''
     # Use patched nixpkgs libffi in order to fix https://github.com/libffi/libffi/pull/857

From ce90effd8797219ee4a6aa39cfaf78efb7cb5f35 Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Sat, 5 Apr 2025 11:30:13 +0200
Subject: [PATCH 13/48] typst: remove xz dep

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

diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix
index ed04a3ee1547..b01912559be4 100644
--- a/pkgs/by-name/ty/typst/package.nix
+++ b/pkgs/by-name/ty/typst/package.nix
@@ -5,7 +5,6 @@
   installShellFiles,
   pkg-config,
   openssl,
-  xz,
   nix-update-script,
   versionCheckHook,
 }:
@@ -31,7 +30,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   buildInputs = [
     openssl
-    xz
   ];
 
   env = {

From 711360a2d2bf9ef437f16054db3a7d1896bea0a8 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sat, 5 Apr 2025 10:28:06 +0000
Subject: [PATCH 14/48] itch-dl: 0.5.2 -> 0.6.1

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

diff --git a/pkgs/by-name/it/itch-dl/package.nix b/pkgs/by-name/it/itch-dl/package.nix
index 9eaf7acdeb91..99fb664572e4 100644
--- a/pkgs/by-name/it/itch-dl/package.nix
+++ b/pkgs/by-name/it/itch-dl/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "itch-dl";
-  version = "0.5.2";
+  version = "0.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "DragoonAethis";
     repo = "itch-dl";
     tag = version;
-    hash = "sha256-MkhXM9CQXbVcnztMPnBscryXWSaSQUeoG6KtVuS8YEo=";
+    hash = "sha256-zwsiG38wOVi3pP0gQWkZqfAmdWKadjB65qiTg68tZWg=";
   };
 
   nativeBuildInputs = with python3Packages; [
@@ -21,21 +21,20 @@ python3Packages.buildPythonApplication rec {
   ];
 
   build-system = with python3Packages; [
-    poetry-core
+    hatchling
   ];
 
   dependencies = with python3Packages; [
     beautifulsoup4
     lxml
-    pydantic
     requests
     tqdm
     urllib3
   ];
 
   pythonRelaxDeps = [
-    "pydantic"
     "urllib3"
+    "beautifulsoup4"
   ];
 
   meta = {

From 0aa6ecb08390dcbd13290f977e8fbdadf316b969 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Sat, 5 Apr 2025 18:29:55 +0200
Subject: [PATCH 15/48] nixosTests.calibre-web: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix   |  2 +-
 nixos/tests/calibre-web.nix | 74 ++++++++++++++++++-------------------
 2 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index c71655064c11..2dfcfabcd256 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -274,7 +274,7 @@ in
   cadvisor = handleTestOn [ "x86_64-linux" ] ./cadvisor.nix { };
   cage = handleTest ./cage.nix { };
   cagebreak = handleTest ./cagebreak.nix { };
-  calibre-web = handleTest ./calibre-web.nix { };
+  calibre-web = runTest ./calibre-web.nix;
   calibre-server = handleTest ./calibre-server.nix { };
   canaille = handleTest ./canaille.nix { };
   castopod = handleTest ./castopod.nix { };
diff --git a/nixos/tests/calibre-web.nix b/nixos/tests/calibre-web.nix
index d14f1b540809..cf66ed1f1921 100644
--- a/nixos/tests/calibre-web.nix
+++ b/nixos/tests/calibre-web.nix
@@ -1,44 +1,42 @@
-import ./make-test-python.nix (
-  { pkgs, lib, ... }:
+{ lib, ... }:
 
-  let
-    port = 3142;
-    defaultPort = 8083;
-  in
-  {
-    name = "calibre-web";
-    meta.maintainers = with lib.maintainers; [ pborzenkov ];
+let
+  port = 3142;
+  defaultPort = 8083;
+in
+{
+  name = "calibre-web";
+  meta.maintainers = with lib.maintainers; [ pborzenkov ];
 
-    nodes = {
-      customized =
-        { pkgs, ... }:
-        {
-          services.calibre-web = {
-            enable = true;
-            listen.port = port;
-            options = {
-              calibreLibrary = "/tmp/books";
-              reverseProxyAuth = {
-                enable = true;
-                header = "X-User";
-              };
+  nodes = {
+    customized =
+      { pkgs, ... }:
+      {
+        services.calibre-web = {
+          enable = true;
+          listen.port = port;
+          options = {
+            calibreLibrary = "/tmp/books";
+            reverseProxyAuth = {
+              enable = true;
+              header = "X-User";
             };
           };
-          environment.systemPackages = [ pkgs.calibre ];
         };
-    };
-    testScript = ''
-      start_all()
+        environment.systemPackages = [ pkgs.calibre ];
+      };
+  };
+  testScript = ''
+    start_all()
 
-      customized.succeed(
-          "mkdir /tmp/books && calibredb --library-path /tmp/books add -e --title test-book"
-      )
-      customized.succeed("systemctl restart calibre-web")
-      customized.wait_for_unit("calibre-web.service")
-      customized.wait_for_open_port(${toString port})
-      customized.succeed(
-          "curl --fail -H X-User:admin 'http://localhost:${toString port}' | grep test-book"
-      )
-    '';
-  }
-)
+    customized.succeed(
+        "mkdir /tmp/books && calibredb --library-path /tmp/books add -e --title test-book"
+    )
+    customized.succeed("systemctl restart calibre-web")
+    customized.wait_for_unit("calibre-web.service")
+    customized.wait_for_open_port(${toString port})
+    customized.succeed(
+        "curl --fail -H X-User:admin 'http://localhost:${toString port}' | grep test-book"
+    )
+  '';
+}

From 38d86e4725804449cce4a38e3fc964ff5edc3f88 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Sat, 5 Apr 2025 18:35:52 +0200
Subject: [PATCH 16/48] nixosTests.calibre-server: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix      | 2 +-
 nixos/tests/calibre-server.nix | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 2dfcfabcd256..3898413d2da1 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -275,7 +275,7 @@ in
   cage = handleTest ./cage.nix { };
   cagebreak = handleTest ./cagebreak.nix { };
   calibre-web = runTest ./calibre-web.nix;
-  calibre-server = handleTest ./calibre-server.nix { };
+  calibre-server = import ./calibre-server.nix { inherit pkgs runTest; };
   canaille = handleTest ./canaille.nix { };
   castopod = handleTest ./castopod.nix { };
   cassandra_3_0 = handleTest ./cassandra.nix { testPackage = pkgs.cassandra_3_0; };
diff --git a/nixos/tests/calibre-server.nix b/nixos/tests/calibre-server.nix
index 2a04dd8cfba4..059058778526 100644
--- a/nixos/tests/calibre-server.nix
+++ b/nixos/tests/calibre-server.nix
@@ -1,11 +1,10 @@
 {
-  system ? builtins.currentSystem,
-  config ? { },
-  pkgs ? import ../.. { inherit system config; },
+  pkgs,
+  runTest,
+  ...
 }:
 
 let
-  inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
   inherit (pkgs.lib)
     concatStringsSep
     maintainers
@@ -74,7 +73,7 @@ let
 in
 mapAttrs (
   test: testConfig:
-  (makeTest (
+  (runTest (
     let
       nodeName = testConfig.nodeName or test;
       calibreConfig = {

From 3a11d2451293015171b6ddbdd08c3863cdd4e946 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Apr 2025 17:46:10 +0000
Subject: [PATCH 17/48] qdrant: 1.13.4 -> 1.13.6

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

diff --git a/pkgs/servers/search/qdrant/default.nix b/pkgs/servers/search/qdrant/default.nix
index 34b6917744d7..7c8dd710dce4 100644
--- a/pkgs/servers/search/qdrant/default.nix
+++ b/pkgs/servers/search/qdrant/default.nix
@@ -15,18 +15,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "qdrant";
-  version = "1.13.4";
+  version = "1.13.6";
 
   src = fetchFromGitHub {
     owner = "qdrant";
     repo = "qdrant";
     tag = "v${version}";
-    hash = "sha256-77BuXTrQPtg7lus4WXukYSrJllR9hBMqn8+xAaq96z8=";
+    hash = "sha256-l/nWlpV3eecTzFK3MnHzmXGYocxKw+YPsyfHWuE/rwg=";
   };
 
   useFetchCargoVendor = true;
 
-  cargoHash = "sha256-r+UilkSsV875j7tNkGJxuR/XC8Y1Fk4nqHYah9Z9q9c=";
+  cargoHash = "sha256-VUUL+oz8nCCNvDohDLfRai+KKd6uG0RLti31mk40wVY=";
 
   nativeBuildInputs = [
     protobuf

From d7170d9a5e5daa1f2325907e771e51d719572a3b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Apr 2025 03:12:32 +0000
Subject: [PATCH 18/48] super-productivity: 12.0.1 -> 12.0.3

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

diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix
index 37e9c2093763..0f8eb12068dc 100644
--- a/pkgs/by-name/su/super-productivity/package.nix
+++ b/pkgs/by-name/su/super-productivity/package.nix
@@ -13,20 +13,20 @@
 
 buildNpmPackage rec {
   pname = "super-productivity";
-  version = "12.0.1";
+  version = "12.0.3";
 
   src = fetchFromGitHub {
     owner = "johannesjo";
     repo = "super-productivity";
     tag = "v${version}";
-    hash = "sha256-s+j9TPdyA5OBGv+fxwz9Ze4SzME9m2nusbwrEsntvQc=";
+    hash = "sha256-6IR4oxucmbmAjAYl+QMEreyTp6aFn8lGzNxA3kNuJOs=";
 
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} -r $out/package-lock.json
     '';
   };
 
-  npmDepsHash = "sha256-uPdfUiFEb9MLdgfLXo5g7EEs2RUJpCxwKR02kqlD7P8=";
+  npmDepsHash = "sha256-42DK/03nxYq4iYVNwyFUXuE0lX7TJbdg0EUMKW1juhY=";
   npmFlags = [ "--legacy-peer-deps" ];
   makeCacheWritable = true;
 

From ebbd070081a52de94a3bc86bf0903f6b5bea2c71 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Apr 2025 06:11:43 +0000
Subject: [PATCH 19/48] fastly: 11.0.0 -> 11.1.0

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

diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix
index e37b50ca71a1..07fa97d868fd 100644
--- a/pkgs/misc/fastly/default.nix
+++ b/pkgs/misc/fastly/default.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "fastly";
-  version = "11.0.0";
+  version = "11.1.0";
 
   src = fetchFromGitHub {
     owner = "fastly";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-6j8r4Rh/FrHSp/Frearot4DSabqU0UHUE13xhkLVI1c=";
+    hash = "sha256-f1GzxDd7ZG9WyB91vqCsKemp9zyBTliKHznWnQhY9/s=";
     # The git commit is part of the `fastly version` original output;
     # leave that output the same in nixpkgs. Use the `.git` directory
     # to retrieve the commit SHA, and remove the directory afterwards,

From 62fd2771ee48865133658eaf5610c8ea0379a1ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Apr 2025 09:11:23 +0000
Subject: [PATCH 20/48] python312Packages.fastcore: 1.8.0 -> 1.8.1

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

diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix
index cdb83a23cab7..91465b899078 100644
--- a/pkgs/development/python-modules/fastcore/default.nix
+++ b/pkgs/development/python-modules/fastcore/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "fastcore";
-  version = "1.8.0";
+  version = "1.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "fastai";
     repo = "fastcore";
     tag = version;
-    hash = "sha256-YsZBPcGWKxE5Cl3HCmB2ZDecFuQa5Q5aTEbZ5ijmB24=";
+    hash = "sha256-slUOh7KBVJ11NqsAR7yC+4Tyqxy3Yq6f9OTlQesJ608=";
   };
 
   build-system = [ setuptools ];
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module for Fast AI";
     homepage = "https://github.com/fastai/fastcore";
-    changelog = "https://github.com/fastai/fastcore/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/fastai/fastcore/blob/${src.tag}/CHANGELOG.md";
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ fab ];
   };

From 7ab42b10486cc2508df90c44d08ebe250a8c3a3f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Apr 2025 10:35:59 +0000
Subject: [PATCH 21/48] llama-cpp: 4958 -> 5060

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

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index d69193e2f0fc..5f6b34027dca 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -82,13 +82,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "4958";
+  version = "5060";
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-Llw2lDLNjkG6nDMQG4hQCPokKgUg/tnPVJQId75XR9g=";
+    hash = "sha256-hReqnwPyzKXR+Nwl4auDCCQqLLNCpM0zILqjs+TB9uk=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT

From 48de8e957550cfb91d6cb8a33cacd9d98d4d4369 Mon Sep 17 00:00:00 2001
From: l1npengtul <l1npengtul@protonmail.com>
Date: Mon, 7 Apr 2025 01:22:24 +0900
Subject: [PATCH 22/48] bitwig-studio: 5.3.1 -> 5.3.2

---
 pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
index 510c9b238c2e..502ddbf06b77 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
@@ -30,12 +30,12 @@
 
 stdenv.mkDerivation rec {
   pname = "bitwig-studio-unwrapped";
-  version = "5.3.1";
+  version = "5.3.2";
 
   src = fetchurl {
     name = "bitwig-studio-${version}.deb";
     url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/";
-    hash = "sha256-mxodFCu4SDzofnoZZZ7TPDUIrRc3UJt8TuEBwDOo2wQ=";
+    hash = "sha256-QKt/myqmoVVffNwkfGcAoknAiZu3D+s7d2lJgtWpvk4=";
   };
 
   nativeBuildInputs = [

From 33ff0f4bec532961027068b875122f5785a781f7 Mon Sep 17 00:00:00 2001
From: andre4ik3 <andre4ik3@fastmail.com>
Date: Sat, 5 Apr 2025 19:54:02 -0400
Subject: [PATCH 23/48] fex: 2503 -> 2504
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: György Kurucz <me@kuruczgy.com>
---
 pkgs/by-name/fe/fex/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix
index af2aac3602f2..07a2d2af0e04 100644
--- a/pkgs/by-name/fe/fex/package.nix
+++ b/pkgs/by-name/fe/fex/package.nix
@@ -5,20 +5,19 @@
   cmake,
   ninja,
   pkg-config,
-  gitMinimal,
   qt5,
   python3,
 }:
 
 llvmPackages.stdenv.mkDerivation (finalAttrs: rec {
   pname = "fex";
-  version = "2503";
+  version = "2504";
 
   src = fetchFromGitHub {
     owner = "FEX-Emu";
     repo = "FEX";
     tag = "FEX-${version}";
-    hash = "sha256-NnYod6DeRv3/6h8SGkGYtgC+RRuIafxoQm3j1Sqk0mU=";
+    hash = "sha256-tqUJBHYSRlEUaLI4WItzotIHGMUNbdjA7o9NjBYZmHw=";
     fetchSubmodules = true;
   };
 
@@ -26,7 +25,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: rec {
     cmake
     ninja
     pkg-config
-    gitMinimal
     qt5.wrapQtAppsHook
     llvmPackages.bintools
 
@@ -50,6 +48,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: rec {
     "-DUSE_LINKER=lld"
     "-DENABLE_LTO=True"
     "-DENABLE_ASSERTIONS=False"
+    (lib.cmakeFeature "OVERRIDE_VERSION" finalAttrs.version)
     (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
   ];
 

From 0d4a626946f858d67527ddea7ae11c7c49642d54 Mon Sep 17 00:00:00 2001
From: "\"Thales Menato\"" <"8753631+thamenato@users.noreply.github.com">
Date: Sun, 6 Apr 2025 14:08:55 -0400
Subject: [PATCH 24/48] vimPlugins.neovim-trunk: init at 2024-06-19

---
 .../editors/vim/plugins/generated.nix         | 24 +++++++++++++------
 .../editors/vim/plugins/vim-plugin-names      |  1 +
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 1846ec23fbce..7b2458c89390 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -1,12 +1,8 @@
 # GENERATED by ./pkgs/applications/editors/vim/plugins/utils/update.py. Do not edit!
-{
-  lib,
-  buildVimPlugin,
-  buildNeovimPlugin,
-  fetchFromGitHub,
-}:
+{ lib, buildVimPlugin, buildNeovimPlugin, fetchFromGitHub }:
 
-final: prev: {
+final: prev:
+{
   BetterLua-vim = buildVimPlugin {
     pname = "BetterLua.vim";
     version = "2020-08-14";
@@ -9347,6 +9343,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  neovim-trunk = buildVimPlugin {
+    pname = "neovim-trunk";
+    version = "2024-06-19";
+    src = fetchFromGitHub {
+      owner = "trunk-io";
+      repo = "neovim-trunk";
+      rev = "835180d0cb2db4aa3a934daf65b1a56549018b94";
+      sha256 = "086l7zf2k2p537a13zwivfkamfgpdkrfgq5r23y014s2x2jrh5dw";
+    };
+    meta.homepage = "https://github.com/trunk-io/neovim-trunk/";
+    meta.hydraPlatforms = [ ];
+  };
+
   neoyank-vim = buildVimPlugin {
     pname = "neoyank.vim";
     version = "2020-12-20";
@@ -21468,4 +21477,5 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+
 }
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 2bbafd674a4f..7d71e8b6e8b9 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -717,6 +717,7 @@ https://github.com/lawrence-laz/neotest-zig/,HEAD,
 https://github.com/Shatur/neovim-ayu/,,
 https://github.com/cloudhead/neovim-fuzzy/,,
 https://github.com/jeffkreeftmeijer/neovim-sensible/,,
+https://github.com/trunk-io/neovim-trunk/,HEAD,
 https://github.com/Shougo/neoyank.vim/,,
 https://github.com/preservim/nerdcommenter/,,
 https://github.com/preservim/nerdtree/,,

From 91232bd0943131d367ee1a9187e5488fd0b11943 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Mar 2025 00:56:23 +0000
Subject: [PATCH 25/48] calico-cni-plugin: 3.29.1 -> 3.29.3

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

diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix
index 14f88767f34b..4da964a3c7bf 100644
--- a/pkgs/applications/networking/cluster/calico/default.nix
+++ b/pkgs/applications/networking/cluster/calico/default.nix
@@ -14,16 +14,16 @@ builtins.mapAttrs
     }:
     buildGoModule rec {
       inherit pname;
-      version = "3.29.1";
+      version = "3.29.3";
 
       src = fetchFromGitHub {
         owner = "projectcalico";
         repo = "calico";
         rev = "v${version}";
-        hash = "sha256-e/xyrFJ9t+awpU8u8uYmXFRnk92/06vI5OoClyAMKTU=";
+        hash = "sha256-JK/iKVLXT8h+xZpkjVBEI8vfgRuoTHwWaoKikjBsJgI=";
       };
 
-      vendorHash = "sha256-OP3J2NE491Aivzo80OmLAyQGe3hixLTz0p9FSA897ao=";
+      vendorHash = "sha256-dkBOhuX/tf+emLLeZ+7fI+z1pKwZLD0ZqZNxUMS32NE=";
 
       inherit doCheck subPackages;
 

From d1f55ace1700d6712a2760909f86852fb06f1f36 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sun, 6 Apr 2025 20:13:50 +0200
Subject: [PATCH 26/48] jujutsu: remove unused `zstd` dependency

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

diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix
index 57e3b780b83d..61d5cd071ced 100644
--- a/pkgs/by-name/ju/jujutsu/package.nix
+++ b/pkgs/by-name/ju/jujutsu/package.nix
@@ -5,7 +5,6 @@
   fetchFromGitHub,
   installShellFiles,
   pkg-config,
-  zstd,
   libgit2,
   libssh2,
   openssl,
@@ -38,7 +37,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   buildInputs = [
-    zstd
     libgit2
     libssh2
   ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];

From 16d86dd191ded78fff7ed0079f1ceddfc77bbcfd Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 6 Apr 2025 20:22:01 +0200
Subject: [PATCH 27/48] fex: cleanup

---
 pkgs/by-name/fe/fex/package.nix | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix
index 07a2d2af0e04..90c2148746e9 100644
--- a/pkgs/by-name/fe/fex/package.nix
+++ b/pkgs/by-name/fe/fex/package.nix
@@ -1,22 +1,23 @@
 {
-  fetchFromGitHub,
   lib,
   llvmPackages,
+  fetchFromGitHub,
   cmake,
   ninja,
   pkg-config,
   qt5,
   python3,
+  nix-update-script,
 }:
 
-llvmPackages.stdenv.mkDerivation (finalAttrs: rec {
+llvmPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "fex";
   version = "2504";
 
   src = fetchFromGitHub {
     owner = "FEX-Emu";
     repo = "FEX";
-    tag = "FEX-${version}";
+    tag = "FEX-${finalAttrs.version}";
     hash = "sha256-tqUJBHYSRlEUaLI4WItzotIHGMUNbdjA7o9NjBYZmHw=";
     fetchSubmodules = true;
   };
@@ -44,10 +45,10 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: rec {
   ];
 
   cmakeFlags = [
-    "-DCMAKE_BUILD_TYPE=Release"
-    "-DUSE_LINKER=lld"
-    "-DENABLE_LTO=True"
-    "-DENABLE_ASSERTIONS=False"
+    (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
+    (lib.cmakeFeature "USE_LINKER" "lld")
+    (lib.cmakeBool "ENABLE_LTO" true)
+    (lib.cmakeBool "ENABLE_ASSERTIONS" false)
     (lib.cmakeFeature "OVERRIDE_VERSION" finalAttrs.version)
     (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
   ];
@@ -62,9 +63,14 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: rec {
     wrapQtApp $out/bin/FEXConfig
   '';
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Fast usermode x86 and x86-64 emulator for Arm64 Linux";
     homepage = "https://fex-emu.com/";
+    changelog = "https://github.com/FEX-Emu/FEX/releases/tag/FEX-${finalAttrs.version}";
     platforms = [ "aarch64-linux" ];
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ andre4ik3 ];

From 6b993d36a1346c430625c1c337695f32d374ff42 Mon Sep 17 00:00:00 2001
From: Thales Menato <8753631+thamenato@users.noreply.github.com>
Date: Sun, 6 Apr 2025 14:22:43 -0400
Subject: [PATCH 28/48] add: neovim-trunk dependencies

---
 pkgs/applications/editors/vim/plugins/overrides.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 151ac986e3b6..eabab9545296 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -2153,6 +2153,13 @@ in
     ];
   };
 
+  neovim-trunk = super.neovim-trunk.overrideAttrs {
+    dependencies = with self; [
+      plenary-nvim
+      telescope-nvim
+    ];
+  };
+
   nlsp-settings-nvim = super.nlsp-settings-nvim.overrideAttrs {
     dependencies = [ self.nvim-lspconfig ];
   };

From 449fe1a49915f9b1e4294de7a650c576337a3ee5 Mon Sep 17 00:00:00 2001
From: Thales Menato <8753631+thamenato@users.noreply.github.com>
Date: Sun, 6 Apr 2025 14:34:16 -0400
Subject: [PATCH 29/48] chore: run nixfmt against generated.nix file

---
 pkgs/applications/editors/vim/plugins/generated.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 7b2458c89390..046ecc73e3a7 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -1,8 +1,12 @@
 # GENERATED by ./pkgs/applications/editors/vim/plugins/utils/update.py. Do not edit!
-{ lib, buildVimPlugin, buildNeovimPlugin, fetchFromGitHub }:
-
-final: prev:
 {
+  lib,
+  buildVimPlugin,
+  buildNeovimPlugin,
+  fetchFromGitHub,
+}:
+
+final: prev: {
   BetterLua-vim = buildVimPlugin {
     pname = "BetterLua.vim";
     version = "2020-08-14";
@@ -21477,5 +21481,4 @@ final: prev:
     meta.hydraPlatforms = [ ];
   };
 
-
 }

From 079175aa953497be2300407b7557da74cc4e20f8 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 6 Apr 2025 19:51:38 +0200
Subject: [PATCH 30/48] inochi-*: add missing libGL and libX11

---
 pkgs/applications/misc/inochi2d/generic.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/misc/inochi2d/generic.nix b/pkgs/applications/misc/inochi2d/generic.nix
index 0a08ebbaae73..b143fa271636 100644
--- a/pkgs/applications/misc/inochi2d/generic.nix
+++ b/pkgs/applications/misc/inochi2d/generic.nix
@@ -16,6 +16,7 @@
   zenity,
   luajit_2_1,
   libGL,
+  libX11,
 
   builderArgs,
 }:
@@ -56,6 +57,8 @@ buildDubPackage (
       dbus
       freetype
       SDL2
+      libGL
+      libX11
     ];
 
     dontUseCmakeConfigure = true;

From ebc3b00e180ac794a23df38d8621a538fbc92138 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 6 Apr 2025 19:52:06 +0200
Subject: [PATCH 31/48] cro-mag-rally: add missing libGL

---
 pkgs/by-name/cr/cro-mag-rally/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/cr/cro-mag-rally/package.nix b/pkgs/by-name/cr/cro-mag-rally/package.nix
index 0cc55c3fb0f6..bce0efdf5515 100644
--- a/pkgs/by-name/cr/cro-mag-rally/package.nix
+++ b/pkgs/by-name/cr/cro-mag-rally/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   SDL2,
+  libGL,
   cmake,
   makeWrapper,
 }:
@@ -25,6 +26,7 @@ stdenv.mkDerivation {
   ];
   buildInputs = [
     SDL2
+    libGL
   ];
 
   installPhase = ''

From 44358c27616ccad3dba5af2804988c0482df153e Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 6 Apr 2025 19:52:32 +0200
Subject: [PATCH 32/48] endless-sky: add missing libX11

---
 pkgs/by-name/en/endless-sky/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/en/endless-sky/package.nix b/pkgs/by-name/en/endless-sky/package.nix
index 532d78085e5d..d19399b2eb62 100644
--- a/pkgs/by-name/en/endless-sky/package.nix
+++ b/pkgs/by-name/en/endless-sky/package.nix
@@ -5,6 +5,7 @@
   SDL2,
   libpng,
   libjpeg,
+  libX11,
   glew,
   openal,
   scons,
@@ -49,6 +50,7 @@ stdenv.mkDerivation rec {
     SDL2
     libpng
     libjpeg
+    libX11
     glew
     openal
     libmad

From 725580ed9be37fdacf408ee34aa9390a49479fb5 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 6 Apr 2025 19:53:24 +0200
Subject: [PATCH 33/48] jaz2: add missing libGL

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

diff --git a/pkgs/by-name/ja/jazz2/package.nix b/pkgs/by-name/ja/jazz2/package.nix
index 20cd5b2a058d..a5e97f26f2d5 100644
--- a/pkgs/by-name/ja/jazz2/package.nix
+++ b/pkgs/by-name/ja/jazz2/package.nix
@@ -8,6 +8,7 @@
   libvorbis,
   openal,
   SDL2,
+  libGL,
   zlib,
   versionCheckHook,
   gitUpdater,
@@ -28,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [
+    libGL
     libopenmpt
     libvorbis
     openal

From 3495def52e122d940953f4070d1199ae3fa61e1b Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 6 Apr 2025 19:53:48 +0200
Subject: [PATCH 34/48] nanosaur2: add missing libGL

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

diff --git a/pkgs/by-name/na/nanosaur2/package.nix b/pkgs/by-name/na/nanosaur2/package.nix
index 6d53df9b414b..476524125e28 100644
--- a/pkgs/by-name/na/nanosaur2/package.nix
+++ b/pkgs/by-name/na/nanosaur2/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   SDL2,
+  libGL,
   cmake,
   makeWrapper,
   unstableGitUpdater,
@@ -26,6 +27,7 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     SDL2
+    libGL
   ];
 
   installPhase = ''

From e9d153d17513f01d0ee172bc05a6fa80956f4587 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 6 Apr 2025 19:54:14 +0200
Subject: [PATCH 35/48] neverball: add missing libX11

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

diff --git a/pkgs/by-name/ne/neverball/package.nix b/pkgs/by-name/ne/neverball/package.nix
index 167023a22f6a..d56ee11a81e7 100644
--- a/pkgs/by-name/ne/neverball/package.nix
+++ b/pkgs/by-name/ne/neverball/package.nix
@@ -7,6 +7,7 @@
   libGL,
   libpng,
   libjpeg,
+  libX11,
   SDL2_ttf,
   libvorbis,
   gettext,
@@ -37,6 +38,7 @@ stdenv.mkDerivation rec {
     libjpeg
     SDL2_ttf
     libvorbis
+    libX11
     gettext
     physfs
   ];

From c490d9578e17d5e09e4e599963593567884d4fdc Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 6 Apr 2025 19:54:41 +0200
Subject: [PATCH 36/48] opensoldat: add missing libX11

---
 pkgs/by-name/op/opensoldat/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/op/opensoldat/package.nix b/pkgs/by-name/op/opensoldat/package.nix
index 89359b898887..3081619b8e10 100644
--- a/pkgs/by-name/op/opensoldat/package.nix
+++ b/pkgs/by-name/op/opensoldat/package.nix
@@ -79,6 +79,7 @@ stdenv.mkDerivation rec {
     physfs
     openal
     gamenetworkingsockets
+    xorg.libX11
   ];
   # TODO(@sternenseemann): set proper rpath via cmake, so we don't need autoPatchelfHook
   runtimeDependencies = [ xorg.libX11 ];

From 6c965e63ed697923f285c1fec1f3df4cb5599b25 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 6 Apr 2025 19:55:05 +0200
Subject: [PATCH 37/48] pioneer: add missing libX11

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

diff --git a/pkgs/by-name/pi/pioneer/package.nix b/pkgs/by-name/pi/pioneer/package.nix
index 8d7889e772e4..6da58aeeb35d 100644
--- a/pkgs/by-name/pi/pioneer/package.nix
+++ b/pkgs/by-name/pi/pioneer/package.nix
@@ -13,6 +13,7 @@
   libpng,
   libsigcxx,
   libvorbis,
+  libX11,
   lua5_2,
   libgbm,
   SDL2,
@@ -49,6 +50,7 @@ stdenv.mkDerivation rec {
     libpng
     libsigcxx
     libvorbis
+    libX11
     lua5_2
     libgbm
     SDL2

From 9b99b8862d8fd08f751edc02b336fe83e70cc681 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 6 Apr 2025 19:55:38 +0200
Subject: [PATCH 38/48] q2pro: add missing libX11 and libGL

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

diff --git a/pkgs/by-name/q2/q2pro/package.nix b/pkgs/by-name/q2/q2pro/package.nix
index ad1372e45f98..e5fa5a314a0e 100644
--- a/pkgs/by-name/q2/q2pro/package.nix
+++ b/pkgs/by-name/q2/q2pro/package.nix
@@ -11,8 +11,10 @@
   curl,
   SDL2,
   openalSoft,
+  libGL,
   libogg,
   libvorbis,
+  libX11,
   libXi,
   wayland,
   wayland-protocols,
@@ -61,8 +63,10 @@ stdenv.mkDerivation (finalAttrs: rec {
       libjpeg
       curl
       SDL2
+      libGL
       libogg
       libvorbis
+      libX11
       ffmpeg
       openalSoft
     ]

From 12514f843ac5fe7bf3b0cc507b6ff9281b10ebec Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 6 Apr 2025 19:56:02 +0200
Subject: [PATCH 39/48] syncterm: add missing libX11

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

diff --git a/pkgs/by-name/sy/syncterm/package.nix b/pkgs/by-name/sy/syncterm/package.nix
index 8a8e27fc7a28..42673516194a 100644
--- a/pkgs/by-name/sy/syncterm/package.nix
+++ b/pkgs/by-name/sy/syncterm/package.nix
@@ -8,6 +8,7 @@
   autoPatchelfHook,
   ncurses,
   SDL2,
+  libX11,
   alsa-lib,
 }:
 
@@ -45,6 +46,7 @@ stdenv.mkDerivation rec {
     autoPatchelfHook
     pkg-config
     SDL2
+    libX11
     perl
     unzip
   ]; # SDL2 for `sdl2-config`.

From 29326ce01f6b53273c565e1f8912d0a601f7f12b Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 6 Apr 2025 19:56:26 +0200
Subject: [PATCH 40/48] vdrift: add missing libX11

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

diff --git a/pkgs/by-name/vd/vdrift/package.nix b/pkgs/by-name/vd/vdrift/package.nix
index 0d976def8333..b4fe9e3022e4 100644
--- a/pkgs/by-name/vd/vdrift/package.nix
+++ b/pkgs/by-name/vd/vdrift/package.nix
@@ -10,6 +10,7 @@
   SDL2,
   SDL2_image,
   libvorbis,
+  libX11,
   bullet,
   curl,
   gettext,
@@ -49,6 +50,7 @@ let
       SDL2
       SDL2_image
       libvorbis
+      libX11
       bullet
       curl
       gettext

From be23fbf4f96bb0636d85e234b933668089426acc Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 6 Apr 2025 19:57:48 +0200
Subject: [PATCH 41/48] vivictpp: add missing libX11

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

diff --git a/pkgs/by-name/vi/vivictpp/package.nix b/pkgs/by-name/vi/vivictpp/package.nix
index 97bba1a68e7a..9d18dee80066 100644
--- a/pkgs/by-name/vi/vivictpp/package.nix
+++ b/pkgs/by-name/vi/vivictpp/package.nix
@@ -10,6 +10,7 @@
   git,
   SDL2,
   SDL2_ttf,
+  libX11,
   freetype,
   harfbuzz,
   ffmpeg,
@@ -65,6 +66,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     SDL2
+    libX11
     SDL2_ttf
     freetype
     harfbuzz

From 1ac175af1a42286b2dfb41a0afaca339ee9b3f55 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 6 Apr 2025 19:58:09 +0200
Subject: [PATCH 42/48] vpv: add missing libGL and libX11

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

diff --git a/pkgs/by-name/vp/vpv/package.nix b/pkgs/by-name/vp/vpv/package.nix
index d54ae34dd0a3..434de05c90ce 100644
--- a/pkgs/by-name/vp/vpv/package.nix
+++ b/pkgs/by-name/vp/vpv/package.nix
@@ -4,9 +4,11 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
+  libGL,
   libpng,
   libtiff,
   libjpeg,
+  libX11,
   SDL2,
   gdal,
   octave,
@@ -39,9 +41,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    libGL
     libpng
     libtiff
     libjpeg
+    libX11
     SDL2
     gdal
     octave

From c50cd2ddb82cc326a275402debac2f78af144d25 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 6 Apr 2025 19:58:29 +0200
Subject: [PATCH 43/48] bugdom: add missing libGL

---
 pkgs/games/bugdom/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/games/bugdom/default.nix b/pkgs/games/bugdom/default.nix
index 3c47f02131c2..8d25bf7dc3d9 100644
--- a/pkgs/games/bugdom/default.nix
+++ b/pkgs/games/bugdom/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   SDL2,
+  libGL,
   IOKit,
   Foundation,
   OpenGL,
@@ -34,6 +35,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [
       SDL2
+      libGL
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       IOKit

From aebf0e1e61649fabfe24c744a442f3558f4ab176 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 6 Apr 2025 19:59:18 +0200
Subject: [PATCH 44/48] cataclysm-dda: add missing libX11

---
 pkgs/games/cataclysm-dda/common.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix
index d580ef782896..24c33f9a0664 100644
--- a/pkgs/games/cataclysm-dda/common.nix
+++ b/pkgs/games/cataclysm-dda/common.nix
@@ -10,6 +10,7 @@
   SDL2_image,
   SDL2_mixer,
   SDL2_ttf,
+  libX11,
   freetype,
   zlib,
   debug,
@@ -31,6 +32,7 @@ let
     SDL2_image
     SDL2_mixer
     SDL2_ttf
+    libX11
     freetype
   ];
 

From a0bdc22eca2b58fdb37cea114adce6f819bb010f Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 6 Apr 2025 19:59:41 +0200
Subject: [PATCH 45/48] quakespasm: add missing libX11

---
 pkgs/games/quakespasm/vulkan.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/games/quakespasm/vulkan.nix
index a802550e48bf..48e36f5d3990 100644
--- a/pkgs/games/quakespasm/vulkan.nix
+++ b/pkgs/games/quakespasm/vulkan.nix
@@ -8,6 +8,7 @@
   libmpg123,
   libopus,
   libvorbis,
+  libX11,
   makeWrapper,
   meson,
   moltenvk,
@@ -48,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
       libmpg123
       libopus
       libvorbis
+      libX11
       opusfile
       vulkan-loader
     ]

From f73411064e9aef1c7a822b3a8409daf8aa17916e Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 6 Apr 2025 20:00:19 +0200
Subject: [PATCH 46/48] warsow: add missing libX11

---
 pkgs/games/warsow/engine.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/games/warsow/engine.nix b/pkgs/games/warsow/engine.nix
index 944827cdb062..e2c4e3bd020a 100644
--- a/pkgs/games/warsow/engine.nix
+++ b/pkgs/games/warsow/engine.nix
@@ -13,6 +13,7 @@
   libpng,
   SDL2,
   libGL,
+  libX11,
   openal,
   zlib,
 }:
@@ -52,6 +53,7 @@ stdenv.mkDerivation {
     libjpeg
     SDL2
     libGL
+    libX11
     openal
     zlib
     libpng

From f41022c7b56151e197a1c5052dfa6af10887d766 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Fri, 4 Apr 2025 00:48:58 +0200
Subject: [PATCH 47/48] luaPackages.rustaceanvim: 6.0.0 -> 6.0.1

---
 pkgs/development/lua-modules/generated-packages.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index d81c0c9f99fb..ac310bb2e652 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -4616,15 +4616,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "rustaceanvim";
-      version = "6.0.0-1";
+      version = "6.0.1-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/rustaceanvim-6.0.0-1.rockspec";
-          sha256 = "1vp162iksmgrhqql2fjjjin3hi5jxnrkggx0gngnlnrzjpc054iw";
+          url = "mirror://luarocks/rustaceanvim-6.0.1-1.rockspec";
+          sha256 = "02qxbrk32fay17nlxs4sf4dpkvsfnj5lkm8wsb2q0a8jaa2v7dxv";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/mrcjkb/rustaceanvim/archive/v6.0.0.zip";
-        sha256 = "15ljsnifbml7v7012p6bnl9cxzxijzgm8n8p6isin23rz0kgasgz";
+        url = "https://github.com/mrcjkb/rustaceanvim/archive/v6.0.1.zip";
+        sha256 = "032barkibbsjjwzq87jbn2sqni3f5bmfvxn2bcq589viwdrziwgf";
       };
 
       disabled = luaOlder "5.1";

From 2f9c1ad5e19a6154d541f878774a9aacc27381b7 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 6 Apr 2025 22:38:55 +0300
Subject: [PATCH 48/48] python312Packages.pyside6: 6.8.0.2 -> 6.9.0

---
 .../python-modules/pyside6/default.nix        |  9 +------
 .../pyside6/fix-installing-docs.patch         | 25 -------------------
 .../python-modules/shiboken6/default.nix      | 10 +++-----
 .../shiboken6/fix-include-qt-headers.patch    |  8 +++---
 4 files changed, 9 insertions(+), 43 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pyside6/fix-installing-docs.patch

diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix
index 541a992b4812..49f559a2f3f7 100644
--- a/pkgs/development/python-modules/pyside6/default.nix
+++ b/pkgs/development/python-modules/pyside6/default.nix
@@ -55,14 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   inherit (shiboken6) version src;
 
-  sourceRoot = "pyside-setup-everywhere-src-6.8.0/sources/pyside6";
-
-  patches = [
-    # Manual backport of https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=cacc9c5803a6dec820dd46211a836453183c8dab
-    # to fit our structure.
-    # FIXME: remove for 6.8.1
-    ./fix-installing-docs.patch
-  ];
+  sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/pyside6";
 
   # cmake/Macros/PySideModules.cmake supposes that all Qt frameworks on macOS
   # reside in the same directory as QtCore.framework, which is not true for Nix.
diff --git a/pkgs/development/python-modules/pyside6/fix-installing-docs.patch b/pkgs/development/python-modules/pyside6/fix-installing-docs.patch
deleted file mode 100644
index 4d8178f153e6..000000000000
--- a/pkgs/development/python-modules/pyside6/fix-installing-docs.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/cmake/Macros/PySideModules.cmake
-+++ b/cmake/Macros/PySideModules.cmake
-@@ -176,6 +176,14 @@ macro(create_pyside_module)
-         set(${module_NAME}_glue_dependency ${${module_NAME}_glue})
-     endif()
- 
-+    # Install module doc files.
-+    set(${module_NAME}_doc "${CMAKE_CURRENT_SOURCE_DIR}/../doc/${lower_module_name}.rst")
-+    set(${module_name}_doc_dependency "")
-+    if(EXISTS ${${module_NAME}_doc})
-+        install(FILES ${${module_NAME}_doc} DESTINATION share/PySide6${pyside6_SUFFIX}/doc)
-+        set(${module_NAME}_doc_dependency ${${module_NAME}_doc})
-+    endif()
-+
-     # Install standalone glue files into typesystems subfolder, so that the resolved relative
-     # paths remain correct.
-     if (module_GLUE_SOURCES)
-@@ -245,6 +253,7 @@ macro(create_pyside_module)
-                         DEPENDS ${total_type_system_files}
-                                 ${module_GLUE_SOURCES}
-                                 ${${module_NAME}_glue_dependency}
-+                                ${${module_NAME}_doc_dependency}
-                         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                         COMMENT "Running generator for ${module_NAME}...")
- 
\ No newline at end of file
diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix
index 51c8fc41b7ad..9cce2a77d10b 100644
--- a/pkgs/development/python-modules/shiboken6/default.nix
+++ b/pkgs/development/python-modules/shiboken6/default.nix
@@ -13,16 +13,14 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "shiboken6";
-  version = "6.8.0.2";
+  version = "6.9.0";
 
   src = fetchurl {
-    # https://download.qt.io/official_releases/QtForPython/shiboken6/
-    # FIXME: inconsistent version numbers in directory name and tarball?
-    url = "mirror://qt/official_releases/QtForPython/shiboken6/PySide6-6.8.0.2-src/pyside-setup-everywhere-src-6.8.0.tar.xz";
-    hash = "sha256-Ghohmo8yfjQNJYJ1+tOp8mG48EvFcEF0fnPdatJStOE=";
+    url = "mirror://qt/official_releases/QtForPython/pyside6/PySide6-${finalAttrs.version}-src/pyside-setup-everywhere-src-${finalAttrs.version}.tar.xz";
+    hash = "sha256-MVtzu3Vw1bnmeTqNP6/R0t1/Q9Ne67AdK1VOogaq2I4=";
   };
 
-  sourceRoot = "pyside-setup-everywhere-src-6.8.0/sources/shiboken6";
+  sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/shiboken6";
 
   patches = [ ./fix-include-qt-headers.patch ];
 
diff --git a/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch b/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch
index 4c6d7bdad3fd..bfa035b92b52 100644
--- a/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch
+++ b/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch
@@ -1,10 +1,10 @@
 --- a/ApiExtractor/clangparser/compilersupport.cpp
 +++ b/ApiExtractor/clangparser/compilersupport.cpp
 @@ -16,6 +16,7 @@
- #include <QtCore/QStandardPaths>
- #include <QtCore/QStringList>
- #include <QtCore/QVersionNumber>
-+#include <QtCore/QRegularExpression>
+ #include <QtCore/qstandardpaths.h>
+ #include <QtCore/qstringlist.h>
+ #include <QtCore/qversionnumber.h>
++#include <QtCore/qregularexpression.h>
  
  #include <clang-c/Index.h>