From b1f58fc1ca542738506489417004b8552e147e79 Mon Sep 17 00:00:00 2001
From: t4ccer <t4ccer@gmail.com>
Date: Fri, 28 Feb 2025 09:05:55 -0700
Subject: [PATCH 01/45] python3Packages.pluthon: 1.0.0 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/pluthon/default.nix b/pkgs/development/python-modules/pluthon/default.nix
index 21994bd0817e..47dd7fad00b0 100644
--- a/pkgs/development/python-modules/pluthon/default.nix
+++ b/pkgs/development/python-modules/pluthon/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pluthon";
-  version = "1.0.0";
+  version = "1.1.0";
 
   format = "pyproject";
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "OpShin";
     repo = "pluthon";
     rev = version;
-    hash = "sha256-IYpkb/RXRu53HoeVKik7Jog5FyXwrWItrxSla9dN0s4=";
+    hash = "sha256-t8KWm2eBq6CzFPAWN9pgbpF62hvNNZWCpphJsY5T2OQ=";
   };
 
   propagatedBuildInputs = [

From 182d5e4fbcb40bc14145246d633fde170a96c526 Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Sun, 18 May 2025 17:29:13 -0500
Subject: [PATCH 02/45] k9s: 0.50.5 -> 0.50.6

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

diff --git a/pkgs/by-name/k9/k9s/package.nix b/pkgs/by-name/k9/k9s/package.nix
index 1cb90107f913..0248406bdaa0 100644
--- a/pkgs/by-name/k9/k9s/package.nix
+++ b/pkgs/by-name/k9/k9s/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule rec {
   pname = "k9s";
-  version = "0.50.5";
+  version = "0.50.6";
 
   src = fetchFromGitHub {
     owner = "derailed";
     repo = "k9s";
     rev = "v${version}";
-    hash = "sha256-hh00R0PCqhAUlwFps40CQ+hc6p2634WEGqNjX1mi/J8=";
+    hash = "sha256-cL7OD9OtkVx325KcANU8FudcOk6HMct6ve2p0qSkEoc=";
   };
 
   ldflags = [
@@ -33,7 +33,7 @@ buildGoModule rec {
 
   proxyVendor = true;
 
-  vendorHash = "sha256-g2tS1EpmG+Wba3kF9cH83JAG6EhKK4LrASGUSFtYYY8=";
+  vendorHash = "sha256-dATWFH5XKicdP8sftGGm2zopTef189MJWd9AM/Gxsjw=";
 
   # TODO investigate why some config tests are failing
   doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64);

From 6186ef38a017e7ffca0502ec254bb41aade70661 Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Sun, 18 May 2025 17:29:35 -0500
Subject: [PATCH 03/45] k9s: add devusb to maintainers

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

diff --git a/pkgs/by-name/k9/k9s/package.nix b/pkgs/by-name/k9/k9s/package.nix
index 0248406bdaa0..65fe7bbd0b97 100644
--- a/pkgs/by-name/k9/k9s/package.nix
+++ b/pkgs/by-name/k9/k9s/package.nix
@@ -75,6 +75,7 @@ buildGoModule rec {
       markus1189
       bryanasdev000
       qjoly
+      devusb
     ];
   };
 }

From fd0565616391d9dbec4616a1e63abfd6d39a87ec Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Tue, 27 May 2025 19:10:02 +0200
Subject: [PATCH 04/45] readest: 0.9.43 -> 0.9.49

Changelog: https://github.com/readest/readest/releases/tag/v0.9.49
Diff: https://github.com/readest/readest/compare/v0.9.43...v0.9.49
---
 pkgs/by-name/re/readest/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix
index da4ba6109cf9..fa253facddbb 100644
--- a/pkgs/by-name/re/readest/package.nix
+++ b/pkgs/by-name/re/readest/package.nix
@@ -20,13 +20,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "readest";
-  version = "0.9.43";
+  version = "0.9.49";
 
   src = fetchFromGitHub {
     owner = "readest";
     repo = "readest";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9ACeMGbOpa3Nh6NQIGckcI2oYNjtQ1pE4Zn++qcE0tM=";
+    hash = "sha256-QvnYLFCL5cX+VIKR29ehzsNPZK/o4A/q1bVFnwLG66I=";
     fetchSubmodules = true;
   };
 
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-ozRDNXWqg0CZ1IgU33C6yJu4e05010jsHeTdIVhB72M=";
+    hash = "sha256-Bd+7MHYBMo4N7UpwkXGmk4oQBbyBMJOtnv6iTVQgn64=";
   };
 
   pnpmRoot = "../..";

From f36421c9c707daf8b6b020f0c250b3ad2e3886c6 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Wed, 28 May 2025 08:46:54 +0200
Subject: [PATCH 05/45] readest: disable telemetry

add patch to disable telemetry
---
 pkgs/by-name/re/readest/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix
index fa253facddbb..b33afc7a8d3f 100644
--- a/pkgs/by-name/re/readest/package.nix
+++ b/pkgs/by-name/re/readest/package.nix
@@ -60,7 +60,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '"Readest"' '"readest"'
     jq 'del(.plugins."deep-link")' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json
     substituteInPlace src/services/constants.ts \
-      --replace-fail "autoCheckUpdates: true" "autoCheckUpdates: false"
+      --replace-fail "autoCheckUpdates: true" "autoCheckUpdates: false" \
+      --replace-fail "telemetryEnabled: true" "telemetryEnabled: false"
   '';
 
   nativeBuildInputs = [

From c8dec73d6baa1d1f654c428ab1269754b557af22 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Wed, 28 May 2025 18:39:46 +0200
Subject: [PATCH 06/45] readest: 0.9.49 -> 0.9.50

Changelog: https://github.com/readest/readest/releases/tag/v0.9.50
Diff: https://github.com/readest/readest/compare/v0.9.49...v0.9.50
---
 pkgs/by-name/re/readest/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix
index b33afc7a8d3f..a742070d9344 100644
--- a/pkgs/by-name/re/readest/package.nix
+++ b/pkgs/by-name/re/readest/package.nix
@@ -20,13 +20,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "readest";
-  version = "0.9.49";
+  version = "0.9.50";
 
   src = fetchFromGitHub {
     owner = "readest";
     repo = "readest";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QvnYLFCL5cX+VIKR29ehzsNPZK/o4A/q1bVFnwLG66I=";
+    hash = "sha256-/DWJZnGhJRBVdtieZBRLmF4Wfe/fo4YQTRT/FFCWUGg=";
     fetchSubmodules = true;
   };
 

From b7692f391ce892202d57d9915e0564783dbc09c4 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Thu, 29 May 2025 15:31:39 +0200
Subject: [PATCH 07/45] ruff: 0.11.11 -> 0.11.12

Diff: astral-sh/ruff@refs/tags/0.11.11...refs/tags/0.11.12
Changelog: https://github.com/astral-sh/ruff/releases/tag/0.11.12
---
 pkgs/by-name/ru/ruff/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index c78d0bb75bbd..625968ee98b0 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -16,19 +16,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruff";
-  version = "0.11.11";
+  version = "0.11.12";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ruff";
     tag = finalAttrs.version;
-    hash = "sha256-PPryfsdge0kOb7RyEkGl7c3pFucRzt0+9tACet3nDGM=";
+    hash = "sha256-5oLMhP4PKzZTp0ab+Fitq97GAVLV/GJmR2JH9IXlfuU";
   };
 
   cargoBuildFlags = [ "--package=ruff" ];
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-LAEuoGTvSXXtx74t1OX+TaGxgvI8UAB3bM+fwiSfFws=";
+  cargoHash = "sha256-PIzR9d0O82M/b7HgmPigc2h8KwjSHi08vs3jAQyXbzs";
 
   nativeBuildInputs = [ installShellFiles ];
 

From bd383ac0e3a51cf5d3b5c102bbef6745c976a0cb Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 29 May 2025 23:43:48 +0200
Subject: [PATCH 08/45] python312Packages.weasyprint: cleanup

---
 .../python-modules/weasyprint/default.nix     | 43 ++++++++++---------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix
index 696bee47ac5f..1061e7e56f47 100644
--- a/pkgs/development/python-modules/weasyprint/default.nix
+++ b/pkgs/development/python-modules/weasyprint/default.nix
@@ -1,26 +1,32 @@
 {
-  stdenv,
   lib,
+  stdenv,
   pkgs,
   buildPythonPackage,
-  cffi,
-  cssselect2,
-  fetchPypi,
-  flit-core,
+  fetchFromGitHub,
   fontconfig,
-  fonttools,
   glib,
   harfbuzz,
   pango,
+
+  # build-system
+  flit-core,
+
+  # dependencies
+  cffi,
+  cssselect2,
+  fonttools,
   pillow,
   pydyf,
   pyphen,
-  pytest-cov-stub,
-  pytestCheckHook,
-  pythonOlder,
-  replaceVars,
   tinycss2,
   tinyhtml5,
+
+  # tests
+  pytest-cov-stub,
+  pytestCheckHook,
+  replaceVars,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
@@ -28,12 +34,11 @@ buildPythonPackage rec {
   version = "65.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
-  src = fetchPypi {
-    inherit version;
-    pname = "weasyprint";
-    hash = "sha256-EgKBvb1C/6p9flztvjGCos7zbqWtl/6fNX5DvmoeWOo=";
+  src = fetchFromGitHub {
+    owner = "Kozea";
+    repo = "WeasyPrint";
+    tag = "v${version}";
+    hash = "sha256-iSeuRX1dnnrGZbcb1yTxOJPD5kgIWY6oz/0v02QJqSs=";
   };
 
   patches = [
@@ -64,6 +69,7 @@ buildPythonPackage rec {
     pkgs.ghostscript
     pytest-cov-stub
     pytestCheckHook
+    writableTmpDirAsHomeHook
   ];
 
   disabledTests = [
@@ -93,11 +99,6 @@ buildPythonPackage rec {
   # Set env variable explicitly for Darwin, but allow overriding when invoking directly
   makeWrapperArgs = [ "--set-default FONTCONFIG_FILE ${FONTCONFIG_FILE}" ];
 
-  preCheck = ''
-    # Fontconfig wants to create a cache.
-    export HOME=$TMPDIR
-  '';
-
   pythonImportsCheck = [ "weasyprint" ];
 
   meta = {

From 103f8664beeefb344c6772804c99428b458b5bf9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 29 May 2025 23:44:47 +0200
Subject: [PATCH 09/45] python312Packages.weasyprint: add versionCheckHook

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

diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix
index 1061e7e56f47..77e64d1a0060 100644
--- a/pkgs/development/python-modules/weasyprint/default.nix
+++ b/pkgs/development/python-modules/weasyprint/default.nix
@@ -26,6 +26,7 @@
   pytest-cov-stub,
   pytestCheckHook,
   replaceVars,
+  versionCheckHook,
   writableTmpDirAsHomeHook,
 }:
 
@@ -69,8 +70,10 @@ buildPythonPackage rec {
     pkgs.ghostscript
     pytest-cov-stub
     pytestCheckHook
+    versionCheckHook
     writableTmpDirAsHomeHook
   ];
+  versionCheckProgramArg = "--version";
 
   disabledTests = [
     # needs the Ahem font (fails on macOS)

From 0b12c690c53b5d98d8fc75e2469eff1c4f08a7e3 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Fri, 30 May 2025 02:21:26 +0200
Subject: [PATCH 10/45] python3Packages.uv: reuse already built uv binary

master: `nix-build -A python3Packages.uv` - `0.59s user 0.19s system 0% cpu 12:01.12 total`
branch: `nix-build -A python3Packages.uv` - `1.55s user 0.15s system 7% cpu 9.331 total`
---
 .../development/python-modules/uv/default.nix | 51 +++++++++++--------
 pkgs/top-level/python-packages.nix            |  2 +-
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/uv/default.nix b/pkgs/development/python-modules/uv/default.nix
index 726a861372db..2ab81cf60602 100644
--- a/pkgs/development/python-modules/uv/default.nix
+++ b/pkgs/development/python-modules/uv/default.nix
@@ -1,36 +1,45 @@
 {
   buildPythonPackage,
-  installShellFiles,
-  rustPlatform,
-  pkgs,
-  versionCheckHook,
+  hatchling,
+  lib,
+  uv,
 }:
 
 buildPythonPackage {
-  inherit (pkgs.uv)
+  inherit (uv)
     pname
     version
     src
-    cargoDeps
     meta
-    cargoBuildFlags
-    postInstall
-    versionCheckProgramArg
     ;
+  pyproject = true;
 
-  postPatch = ''
-    substituteInPlace python/uv/_find_uv.py \
-      --replace-fail '"""Return the uv binary path."""' "return '$out/bin/uv'"
+  build-system = [ hatchling ];
+
+  postPatch =
+    # Do not rely on path lookup at runtime to find the uv binary.
+    # Use the propagated binary instead.
+    ''
+      substituteInPlace python/uv/_find_uv.py \
+        --replace-fail '"""Return the uv binary path."""' "return '${lib.getExe uv}'"
+    ''
+    # Sidestep the maturin build system in favour of reusing the binary already built by nixpkgs,
+    # to avoid rebuilding the uv binary for every active python package set.
+    + ''
+      substituteInPlace pyproject.toml \
+        --replace-fail 'requires = ["maturin>=1.0,<2.0"]' 'requires = ["hatchling"]' \
+        --replace-fail 'build-backend = "maturin"' 'build-backend = "hatchling.build"'
+
+      cat >> pyproject.toml <<EOF
+      [tool.hatch.build]
+      packages = ['python/uv']
+
+      EOF
+    '';
+
+  postInstall = ''
+    mkdir -p $out/bin && ln -s ${lib.getExe uv} $out/bin/uv
   '';
 
-  nativeBuildInputs = [
-    installShellFiles
-    rustPlatform.cargoSetupHook
-    rustPlatform.maturinBuildHook
-  ];
-
-  nativeCheckInputs = [ versionCheckHook ];
-
-  pyproject = true;
   pythonImportsCheck = [ "uv" ];
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 764bab2093a5..ada07cfb99f4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18639,7 +18639,7 @@ self: super: with self; {
 
   uuid6 = callPackage ../development/python-modules/uuid6 { };
 
-  uv = callPackage ../development/python-modules/uv { };
+  uv = callPackage ../development/python-modules/uv { inherit (pkgs) uv; };
 
   uv-build = callPackage ../development/python-modules/uv-build { };
 

From 31e99a79e746ebf22da748a30d892a1cd30381b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 May 2025 05:15:59 +0000
Subject: [PATCH 11/45] netron: 8.3.4 -> 8.3.5

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

diff --git a/pkgs/by-name/ne/netron/package.nix b/pkgs/by-name/ne/netron/package.nix
index 6d37b7073c9c..5269f9261f52 100644
--- a/pkgs/by-name/ne/netron/package.nix
+++ b/pkgs/by-name/ne/netron/package.nix
@@ -16,16 +16,16 @@ let
 in
 buildNpmPackage (finalAttrs: {
   pname = "netron";
-  version = "8.3.4";
+  version = "8.3.5";
 
   src = fetchFromGitHub {
     owner = "lutzroeder";
     repo = "netron";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-P7lv0pnhrdU9zFwCzQYwYilq6qJ1UUaYgVDMiRZP5M8=";
+    hash = "sha256-YxvUUn8VWv5M6FvIHJCaXQl7PRGcZ8qSgrZ7K0+8iME=";
   };
 
-  npmDepsHash = "sha256-gPRxgf4XTxIZIKTZbr07zzEJW1n0Waas+zms6Ap6RAY=";
+  npmDepsHash = "sha256-fsF40qUKUNXeqvdM1m/IEgnxRZrnGW/aOYS3oZKQNpk=";
 
   nativeBuildInputs = [ jq ];
 

From 1f3967f132dd023cfb17b008dbbcb8d693bd72b9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 29 May 2025 23:51:03 +0200
Subject: [PATCH 12/45] python312Packages.weasyprint: mark as broken on darwin

---
 pkgs/development/python-modules/weasyprint/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix
index 77e64d1a0060..3767704c8200 100644
--- a/pkgs/development/python-modules/weasyprint/default.nix
+++ b/pkgs/development/python-modules/weasyprint/default.nix
@@ -111,5 +111,10 @@ buildPythonPackage rec {
     homepage = "https://weasyprint.org/";
     license = lib.licenses.bsd3;
     teams = [ lib.teams.apm ];
+    badPlatforms = [
+      # Fatal Python error: Segmentation fault
+      # "...weasyprint/pdf/fonts.py", line 221 in _harfbuzz_subset
+      lib.systems.inspect.patterns.isDarwin
+    ];
   };
 }

From c70d6086d0cc3f037ecf34fef013a6f96eda6c5e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 May 2025 15:47:41 +0000
Subject: [PATCH 13/45] vscode-extensions.eamodio.gitlens: 17.1.0 -> 17.1.1

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 9d8ad86b2c16..60e467752968 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1587,8 +1587,8 @@ let
           # semver scheme, contrary to preview versions which are listed on
           # the VSCode Marketplace and use a calver scheme. We should avoid
           # using preview versions, because they expire after two weeks.
-          version = "17.1.0";
-          hash = "sha256-WPSMf1yLXSDqImpMTxn1eXcSrimVSVjjaXDzFMQ/l0E=";
+          version = "17.1.1";
+          hash = "sha256-hlhq4bR3v0AqI3lxilgNEgjjEEBVL0xfvIWbV/Ronh4=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";

From 8ce8c05ca4a1da0c44afa976e71ae6e5447ca4c7 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Fri, 30 May 2025 12:45:48 -0400
Subject: [PATCH 14/45] hamrs-pro: 2.37.1 -> 2.38.0

Changelog: https://hamrs.app/announcements

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/ha/hamrs-pro/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ha/hamrs-pro/package.nix b/pkgs/by-name/ha/hamrs-pro/package.nix
index ccdff2aefdb8..009cc7cc193e 100644
--- a/pkgs/by-name/ha/hamrs-pro/package.nix
+++ b/pkgs/by-name/ha/hamrs-pro/package.nix
@@ -8,29 +8,29 @@
 
 let
   pname = "hamrs-pro";
-  version = "2.37.1";
+  version = "2.38.0";
 
   throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}";
 
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-linux-x86_64.AppImage";
-      hash = "sha256-kLYgqRH+RpyitUSZVoZFfqVsrJjTXeZp80ILHGQmGTk=";
+      hash = "sha256-G9zap1AaPZepIajZHbUDMODJ7l+7JSD8oJq7EecmE+M=";
     };
 
     aarch64-linux = fetchurl {
       url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-linux-arm64.AppImage";
-      hash = "sha256-BKS7xPzVoIUToqEbtI+8t4Gf7HvZSWhzfXmToghFPEk=";
+      hash = "sha256-eVt2ciWFTKJdV0YoQyU98DD90aMUoOWTqzbZ/s0G+0E=";
     };
 
     x86_64-darwin = fetchurl {
       url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-mac-x64.dmg";
-      hash = "sha256-gejyYoW7VcR0ILD/PSwFGC2tzLiiR2vjEsErBxbvJ3o=";
+      hash = "sha256-ggWnB5QcJM9bsOyyVe9dSvOU63hr8heWQTE6ncPgriU=";
     };
 
     aarch64-darwin = fetchurl {
       url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-mac-arm64.dmg";
-      hash = "sha256-Hi/t5ShfhUFw0aEzb2XIhOIppXg04qnq8tl3LKNH3qQ=";
+      hash = "sha256-s8Ly1UYBy0EzUCKUCJxx1PcxVQe2gkeuXDudqnSuYjE=";
     };
   };
 

From be4232724e075e381fb3d6510ceefc7bc3e65705 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 May 2025 18:46:56 +0000
Subject: [PATCH 15/45] vsce: 3.4.1 -> 3.4.2

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

diff --git a/pkgs/by-name/vs/vsce/package.nix b/pkgs/by-name/vs/vsce/package.nix
index b98b8844994a..6c70a26d29a9 100644
--- a/pkgs/by-name/vs/vsce/package.nix
+++ b/pkgs/by-name/vs/vsce/package.nix
@@ -12,13 +12,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "vsce";
-  version = "3.4.1";
+  version = "3.4.2";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "vscode-vsce";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ufSEKkLqP+D/D5l5teL82RsoVgIFhbyOVjnZfnecsKI=";
+    hash = "sha256-T3uboozO4YRA8qqu833pIFt4yzIYRBZQdm8nawEZo2s=";
   };
 
   npmDepsHash = "sha256-J7ES/a6RHeTY1grdzgYu9ex7BOzadqng2/h2LlTZLns=";

From 448a53ad54f5a7cb1a5e6e8442c6e8e6627e1eb4 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Fri, 30 May 2025 17:44:14 -0400
Subject: [PATCH 16/45] nyan: enable and fix strictDeps build

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/ny/nyan/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ny/nyan/package.nix b/pkgs/by-name/ny/nyan/package.nix
index be3b8891c96a..6745f55cfaf2 100644
--- a/pkgs/by-name/ny/nyan/package.nix
+++ b/pkgs/by-name/ny/nyan/package.nix
@@ -20,9 +20,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-BtvMZaQutcPqTSCN5gxYUU3CQTyCns1ldkcnjwJOFa8=";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     clang
     cmake
+    flex
   ];
 
   buildInputs = [

From 36354c7702e0a3436d024f4cc5ef1bfb07661526 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Fri, 30 May 2025 15:59:10 -0700
Subject: [PATCH 17/45] python3Packages.pymupdf: propagated mupdf-cxx in such a
 way that it won't be filtered out

Otherwise, we end up in this situation where this derivation works:

```nix
{ pkgs ? import ./. { } }:

pkgs.runCommand "driver" { buildInputs = [ pkgs.python3Packages.pymupdf ]; } ''
  python -c 'import pymupdf;' > $out
''
```

... but this ostensibly identical derivation fails.

```nix
{ pkgs ? import ./. { } }:

pkgs.runCommand "driver" { buildInputs = [ pkgs.python3.withPackages (ps: [ ps.pymupdf ]; } ''
  python -c 'import pymupdf;' > $out
''
```

What's happening is that the propagated input `mupdf-cxx` doesn't pass the filter check in `requiredPythonModules` as it does not have a Python module as defined in that function.

Now, it does.

Huge thanks to hexa who debugged this with me on Matrix.

Co-authored-by: Martin Weinelt <hexa@darmstadt.ccc.de>
---
 pkgs/development/python-modules/pymupdf/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix
index 8db2acf59a3c..aa126e9f748a 100644
--- a/pkgs/development/python-modules/pymupdf/default.nix
+++ b/pkgs/development/python-modules/pymupdf/default.nix
@@ -6,6 +6,7 @@
   fetchFromGitHub,
   fetchpatch,
   python,
+  toPythonModule,
 
   # build-system
   libclang,
@@ -39,6 +40,8 @@ let
     enablePython = true;
     python3 = python;
   };
+  mupdf-cxx-lib = toPythonModule (lib.getLib mupdf-cxx);
+  mupdf-cxx-dev = lib.getDev mupdf-cxx;
 in
 buildPythonPackage rec {
   pname = "pymupdf";
@@ -87,7 +90,7 @@ buildPythonPackage rec {
     gumbo
   ];
 
-  propagatedBuildInputs = [ mupdf-cxx ];
+  propagatedBuildInputs = [ mupdf-cxx-lib ];
 
   env = {
     # force using system MuPDF (must be defined in environment and empty)
@@ -95,14 +98,14 @@ buildPythonPackage rec {
     # Setup the name of the package away from the default 'libclang'
     PYMUPDF_SETUP_LIBCLANG = "clang";
     # provide MuPDF paths
-    PYMUPDF_MUPDF_LIB = "${lib.getLib mupdf-cxx}/lib";
-    PYMUPDF_MUPDF_INCLUDE = "${lib.getDev mupdf-cxx}/include";
+    PYMUPDF_MUPDF_LIB = "${mupdf-cxx-lib}/lib";
+    PYMUPDF_MUPDF_INCLUDE = "${mupdf-cxx-dev}/include";
   };
 
   # TODO: manually add mupdf rpath until upstream fixes it
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     for lib in */*.so $out/${python.sitePackages}/*/*.so; do
-      install_name_tool -add_rpath ${lib.getLib mupdf-cxx}/lib "$lib"
+      install_name_tool -add_rpath ${mupdf-cxx-lib}/lib "$lib"
     done
   '';
 

From 9276d3225945c544c6efab8210686bd7612a9115 Mon Sep 17 00:00:00 2001
From: Emanuel Pilz <emonadeo@gmail.com>
Date: Sat, 31 May 2025 01:19:56 +0200
Subject: [PATCH 18/45] deno: 2.3.3 -> 2.3.5

https://github.com/denoland/deno/releases/tag/v2.3.4
https://github.com/denoland/deno/releases/tag/v2.3.5
---
 pkgs/by-name/de/deno/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index 4bd1e5794f7d..3b0ac1600533 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -21,17 +21,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "deno";
-  version = "2.3.3";
+  version = "2.3.5";
 
   src = fetchFromGitHub {
     owner = "denoland";
     repo = "deno";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KfgxKmxkF5/BrAsXkpmyWXV2H+vwX31dnzQORtt3A90=";
+    hash = "sha256-ASP+1EuGLU9BBY7iBer92AbnVEeQc4nwtOEyULlvc2w=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-DWODuTslGvx9PHUMsxY+MS15IcECcq7Ne7IUEovWoa0=";
+  cargoHash = "sha256-XJy7+cARYEX8tAPXLHJnEwXyZIwPaqhM7ZUzoem1Wo0=";
 
   postPatch = ''
     # Use patched nixpkgs libffi in order to fix https://github.com/libffi/libffi/pull/857

From dc82b02527792f8273bf6d8067a386aa2f69fd1b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 May 2025 01:19:18 +0000
Subject: [PATCH 19/45] aider-chat-full: 0.83.2 -> 0.84.0

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

diff --git a/pkgs/development/python-modules/aider-chat/default.nix b/pkgs/development/python-modules/aider-chat/default.nix
index 4e7fcc9a01a9..54953304559a 100644
--- a/pkgs/development/python-modules/aider-chat/default.nix
+++ b/pkgs/development/python-modules/aider-chat/default.nix
@@ -126,7 +126,7 @@ let
     d.stopwords
   ]);
 
-  version = "0.83.2";
+  version = "0.84.0";
   aider-chat = buildPythonPackage {
     pname = "aider-chat";
     inherit version;
@@ -139,7 +139,7 @@ let
       owner = "Aider-AI";
       repo = "aider";
       tag = "v${version}";
-      hash = "sha256-fVysmaB2jGS2XJlxyFIdJmQShzxz2q4TQf8zNuCT2GE=";
+      hash = "sha256-TOlqwJM9wIAURSimuh9mysYDwgH9AfFev8jY9elLNk8=";
     };
 
     pythonRelaxDeps = true;

From 73f7ebf96cf009ee4d59019f4d99e4408efbb3ea Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sat, 31 May 2025 00:00:26 -0400
Subject: [PATCH 20/45] yetris: fix compilation on aarch64-linux

https://hydra.nixos.org/build/297262484/nixlog/1

char's are not signed by default on aarch64 systems.

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/ye/yetris/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ye/yetris/package.nix b/pkgs/by-name/ye/yetris/package.nix
index c22401849db8..d460242a8af8 100644
--- a/pkgs/by-name/ye/yetris/package.nix
+++ b/pkgs/by-name/ye/yetris/package.nix
@@ -17,6 +17,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-k9CXXIaDk1eAtRBEj0VCfE+D1FtmIDX3niubAdrfjqw=";
   };
 
+  postPatch = ''
+    substituteInPlace src/Game/Entities/RotationSystemSRS.cpp \
+      --replace-fail 'char' 'signed char'
+    substituteInPlace src/Game/Entities/PieceDefinitions.cpp \
+      --replace-fail 'char' 'signed char'
+    substituteInPlace src/Game/Entities/PieceDefinitions.hpp \
+      --replace-fail 'char' 'signed char'
+  '';
+
   buildInputs = [
     ncurses
   ];

From 6d6270fa668ac510bdc3fedc18ab36456974eb3d Mon Sep 17 00:00:00 2001
From: MidAutumnMoon <me@418.im>
Date: Sat, 31 May 2025 16:41:50 +0800
Subject: [PATCH 21/45] terraform-providers._assert: init at v0.16.0

---
 .../cluster/terraform-providers/providers.json           | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 425aa25cb713..60182c6a0aa6 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1,4 +1,13 @@
 {
+  "_assert": {
+    "hash": "sha256-ngHxzV7lRg6pOtyNTdCv3ToRK/vO016Vp2mlh7QT8Rc=",
+    "homepage": "https://registry.terraform.io/providers/hashicorp/assert",
+    "owner": "hashicorp",
+    "repo": "terraform-provider-assert",
+    "rev": "v0.16.0",
+    "spdx": "MPL-2.0",
+    "vendorHash": "sha256-nHaBNYCKfTvaDnz2SeexM2cyNVK5ThPYn4rnGEw7Wi0="
+  },
   "aci": {
     "hash": "sha256-NS5q6ElCGEGSceOCIVudKE6m6EzXMV/3HGHHXwYopOA=",
     "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci",

From 428a14cb18a2630787da4d0395bc49230450ce28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Sat, 31 May 2025 10:57:29 +0200
Subject: [PATCH 22/45] tailscale: disable flaky test

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

diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index 54b850dba942..057b4428ab4b 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -149,6 +149,9 @@ buildGoModule {
 
           # context deadline exceeded
           "TestPacketFilterFromNetmap"
+
+          # flaky: https://github.com/tailscale/tailscale/issues/15348
+          "TestSafeFuncHappyPath"
         ]
         ++ lib.optionals stdenv.hostPlatform.isDarwin [
           # syscall default route interface en0 differs from netstat

From 86328833587c5c7dbea5947eec38801b6745a268 Mon Sep 17 00:00:00 2001
From: phucleeuwu <125681538+phucleeuwu@users.noreply.github.com>
Date: Sat, 31 May 2025 16:24:58 +0700
Subject: [PATCH 23/45] update yaziPlugins.yatline to  0-unstable-2025-05-31

---
 pkgs/by-name/ya/yazi/plugins/yatline/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/yatline/default.nix b/pkgs/by-name/ya/yazi/plugins/yatline/default.nix
index 372e58d51d73..8df8e9e55860 100644
--- a/pkgs/by-name/ya/yazi/plugins/yatline/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/yatline/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "yatline.yazi";
-  version = "0-unstable-2025-04-22";
+  version = "0-unstable-2025-05-31";
 
   src = fetchFromGitHub {
     owner = "imsi32";
     repo = "yatline.yazi";
-    rev = "2ecf715d33866e5f8a63af25f6a242821746ddb7";
-    hash = "sha256-l4IrdALlgKd1USxE2+bD0Lkw3DgBoQDBxgxevrFhytU=";
+    rev = "4872af0da53023358154c8233ab698581de5b2b2";
+    hash = "sha256-7uk8QXAlck0/4bynPdh/m7Os2ayW1UXbELmusPqRmf4=";
   };
 
   meta = {

From 48fcb86b58ef40ab21a640fda2422e46b3fb0efb Mon Sep 17 00:00:00 2001
From: phucleeuwu <125681538+phucleeuwu@users.noreply.github.com>
Date: Sat, 31 May 2025 16:47:44 +0700
Subject: [PATCH 24/45] yaziPlugins.yatline-githead: init at
 0-unstable-2025-05-31

---
 .../yazi/plugins/yatline-githead/default.nix  | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 pkgs/by-name/ya/yazi/plugins/yatline-githead/default.nix

diff --git a/pkgs/by-name/ya/yazi/plugins/yatline-githead/default.nix b/pkgs/by-name/ya/yazi/plugins/yatline-githead/default.nix
new file mode 100644
index 000000000000..fbd722c2732e
--- /dev/null
+++ b/pkgs/by-name/ya/yazi/plugins/yatline-githead/default.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  fetchFromGitHub,
+  mkYaziPlugin,
+}:
+mkYaziPlugin {
+  pname = "yatline-githead.yazi";
+  version = "0-unstable-2025-05-31";
+
+  src = fetchFromGitHub {
+    owner = "imsi32";
+    repo = "yatline-githead.yazi";
+    rev = "f8f969e84c39ad4215334ea5012183a2a5a6160b";
+    hash = "sha256-Cs8zSYtUfdCmKwIkJwQGyQNeSOmmpPvObCMnGm+32zg=";
+  };
+
+  meta = {
+    description = "githead.yazi with yatline.yazi support";
+    homepage = "https://github.com/imsi32/yatline-githead.yazi";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ khaneliman ];
+  };
+}

From 0e8dd7e17552a0ea65934fda4483dba96fdfc9fb Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Tue, 27 May 2025 02:15:56 +0200
Subject: [PATCH 25/45] stalwart-mail: build against system jemalloc

---
 pkgs/by-name/st/stalwart-mail/package.nix | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix
index a6aea418ca01..1567814a12a4 100644
--- a/pkgs/by-name/st/stalwart-mail/package.nix
+++ b/pkgs/by-name/st/stalwart-mail/package.nix
@@ -9,6 +9,7 @@
   sqlite,
   foundationdb,
   zstd,
+  rust-jemalloc-sys-unprefixed,
   stdenv,
   nix-update-script,
   nixosTests,
@@ -18,6 +19,9 @@
   stalwartEnterprise ? false,
 }:
 
+let
+  rocksdbJemalloc = rocksdb.override { enableJemalloc = true; };
+in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "stalwart-mail" + (lib.optionalString stalwartEnterprise "-enterprise");
   version = "0.11.8";
@@ -29,6 +33,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-VqGosbSQxNeOS+kGtvXAmz6vyz5mJlXvKZM57B1Xue4=";
   };
 
+  # rocksdb does not properly distinguish between pointers it has allocated itself
+  # and pointers which were passed in and might be registered with a different
+  # allocator, so we enable the unprefixed_malloc_on_supported_platforms to use
+  # jemalloc implicitly in the entire process.
+  postPatch = ''
+    for file in crates/main/Cargo.toml tests/Cargo.toml; do
+      substituteInPlace $file --replace-fail \
+        'jemallocator = "0.5.0"' 'jemallocator = { version = "0.5.0", features = ["unprefixed_malloc_on_supported_platforms"] }'
+    done
+  '';
+
   useFetchCargoVendor = true;
   cargoHash = "sha256-iheURWxO0cOvO+FV01l2Vmo0B+S2mXzue6mx3gapftQ=";
 
@@ -43,6 +58,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     openssl
     sqlite
     zstd
+    rust-jemalloc-sys-unprefixed
+    rocksdbJemalloc
   ] ++ lib.optionals (stdenv.hostPlatform.isLinux && withFoundationdb) [ foundationdb ];
 
   # Issue: https://github.com/stalwartlabs/mail-server/issues/1104
@@ -63,8 +80,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   env = {
     OPENSSL_NO_VENDOR = true;
     ZSTD_SYS_USE_PKG_CONFIG = true;
-    ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
-    ROCKSDB_LIB_DIR = "${rocksdb}/lib";
+    ROCKSDB_INCLUDE_DIR = "${rocksdbJemalloc}/include";
+    ROCKSDB_LIB_DIR = "${rocksdbJemalloc}/lib";
   };
 
   postInstall = ''
@@ -151,7 +168,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   __darwinAllowLocalNetworking = true;
 
   passthru = {
-    inherit rocksdb; # make used rocksdb version available (e.g., for backup scripts)
+    rocksdb = rocksdbJemalloc; # make used rocksdb version available (e.g., for backup scripts)
     webadmin = callPackage ./webadmin.nix { };
     updateScript = nix-update-script { };
     tests.stalwart-mail = nixosTests.stalwart-mail;

From 176801036c5150900792c9803fb2ab842e98f673 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Sat, 31 May 2025 11:56:57 +0200
Subject: [PATCH 26/45] nixosTests.stalwart-mail: test with rocksdb

---
 nixos/tests/stalwart-mail.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/nixos/tests/stalwart-mail.nix b/nixos/tests/stalwart-mail.nix
index cfc0d3bb1c5b..f5503c0cec19 100644
--- a/nixos/tests/stalwart-mail.nix
+++ b/nixos/tests/stalwart-mail.nix
@@ -48,9 +48,20 @@ in
           session.auth.directory = "'in-memory'";
           storage.directory = "in-memory";
 
+          storage.data = "rocksdb";
+          storage.fts = "rocksdb";
+          storage.blob = "rocksdb";
+          storage.lookup = "rocksdb";
+
           session.rcpt.directory = "'in-memory'";
           queue.outbound.next-hop = "'local'";
 
+          store."rocksdb" = {
+            type = "rocksdb";
+            path = "/var/lib/stalwart-mail/data";
+            compression = "lz4";
+          };
+
           directory."in-memory" = {
             type = "memory";
             principals = [
@@ -116,6 +127,12 @@ in
       main.wait_for_open_port(143)
 
       main.succeed("test-smtp-submission")
+
+      # restart stalwart to test rocksdb compaction of existing database
+      main.succeed("systemctl restart stalwart-mail.service")
+      main.wait_for_open_port(587)
+      main.wait_for_open_port(143)
+
       main.succeed("test-imap-read")
     '';
 

From a941126bb0b50b0637f596be65f8f646817506e5 Mon Sep 17 00:00:00 2001
From: mdarocha <git@mdarocha.pl>
Date: Tue, 26 Sep 2023 21:14:12 +0200
Subject: [PATCH 27/45] midisheetmusic: fix tests, remove dependencies on
 dotnetPackages

---
 pkgs/by-name/mi/midisheetmusic/package.nix | 55 ++++++++++++++++------
 1 file changed, 40 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/mi/midisheetmusic/package.nix b/pkgs/by-name/mi/midisheetmusic/package.nix
index 211e012b7e8a..b5cce6f2adaf 100644
--- a/pkgs/by-name/mi/midisheetmusic/package.nix
+++ b/pkgs/by-name/mi/midisheetmusic/package.nix
@@ -3,14 +3,33 @@
   stdenv,
   fetchurl,
   mono,
-  dotnetPackages,
+  mkNugetDeps,
   makeWrapper,
+  makeFontsConf,
   gtk2,
   cups,
   timidity,
 }:
 
 let
+  deps = mkNugetDeps {
+    name = "midisheetmusic-deps";
+    nugetDeps =
+      { fetchNuGet }:
+      [
+        (fetchNuGet {
+          pname = "NUnit.Console";
+          version = "3.0.1";
+          hash = "sha256-FkzpEk12msmUp5I05ZzlGiG+UInoYhBmar/vB5Gt4H8=";
+        })
+        (fetchNuGet {
+          pname = "NUnit";
+          version = "2.6.4";
+          hash = "sha256-Kkft3QO9T5WwsvyPRNGT2nut7RS7OWArDjIYxvwA8qU=";
+        })
+      ];
+  };
+
   version = "2.6";
 in
 stdenv.mkDerivation {
@@ -22,7 +41,6 @@ stdenv.mkDerivation {
     sha256 = "05c6zskj50g29f51lx8fvgzsi3f31z01zj6ssjjrgr7jfs7ak70p";
   };
 
-  nativeCheckInputs = (with dotnetPackages; [ NUnitConsole ]);
   nativeBuildInputs = [
     mono
     makeWrapper
@@ -31,25 +49,32 @@ stdenv.mkDerivation {
   buildPhase = ''
     for i in Classes/MidiPlayer.cs Classes/MidiSheetMusic.cs
     do
-      substituteInPlace $i --replace "/usr/bin/timidity" "${timidity}/bin/timidity"
+      substituteInPlace $i --replace-fail "/usr/bin/timidity" "${timidity}/bin/timidity"
     done
 
     ./build.sh
   '';
 
-  # include missing file with unit tests for building
-  # switch from mono nunit dll to standalone dll otherwise mono compiler barks
-  # run via nunit3 console, because mono nunit console wants access $HOME
+  doCheck = true;
+
   checkPhase = ''
+    # Resolves the warning "Fontconfig error: No writable cache directories"
+    export XDG_CACHE_HOME="$(mktemp -d)"
+
+    # Adds one file with tests that's missing from compiliation
+    # Makes sure NUnit framework from NuGet can be found
     substituteInPlace UnitTestDLL.csproj \
-      --replace "</Compile>" '</Compile><Compile Include="Classes\UnitTest.cs"/>' \
-      --replace nunit.framework.dll "${dotnetPackages.NUnit}/lib/dotnet/NUnit/nunit.framework.dll"
+      --replace-fail '</Compile>' '</Compile><Compile Include="Classes\UnitTest.cs"/>' \
+      --replace-fail 'nunit.framework.dll' '${deps}/share/nuget/packages/nunit/2.6.4/lib/nunit.framework.dll'
     ./build_unit_test.sh
-    nunit3-console bin/Debug/UnitTest.dll
+
+    # 2 tests are still failing, we exclude them for now
+    mono ${deps}/share/nuget/packages/nunit.console/3.0.1/tools/nunit3-console.exe bin/Debug/UnitTest.dll \
+      --where "test != 'MidiFileTest.TestChangeSoundTrack' && test != 'MidiFileTest.TestChangeSoundPerChannelTracks'"
   '';
 
-  # 2 tests of 47 are still failing
-  doCheck = false;
+  # This fixes tests that fail because of missing fonts
+  FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };
 
   installPhase = ''
     mkdir -p $out/share/applications $out/share/pixmaps $out/bin
@@ -69,12 +94,12 @@ stdenv.mkDerivation {
       --add-flags $out/bin/.MidiSheetMusic.exe
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Convert MIDI Files to Piano Sheet Music for two hands";
     mainProgram = "midisheetmusic.mono.exe";
     homepage = "http://midisheetmusic.com";
-    license = licenses.gpl2;
-    maintainers = [ ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.mdarocha ];
+    platforms = lib.platforms.linux;
   };
 }

From 081a65f4ffb20d74e9555ddb00def7ce231ae5f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 May 2025 13:49:30 +0000
Subject: [PATCH 28/45] netbird: 0.45.1 -> 0.45.2

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

diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix
index 7585d07c79fa..8adbee3c88e9 100644
--- a/pkgs/by-name/ne/netbird/package.nix
+++ b/pkgs/by-name/ne/netbird/package.nix
@@ -31,13 +31,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "netbird";
-  version = "0.45.1";
+  version = "0.45.2";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-55Vyhzt0WtJRq9CcH7mXw7cklAce/lvC1S+MBMDnMbo=";
+    hash = "sha256-lvulqneKFxmZ/EQDmQbx1SzsfZxLb8tGyLFJo8z9U0w=";
   };
 
   vendorHash = "sha256-EVhtxYDinmid5C/3N8UGmCzWw1qIE3m0rXes4uFpcOM=";

From 4e690a28990f8dffd85d3dc68b8615014b4ef2d9 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 31 May 2025 18:08:09 +0200
Subject: [PATCH 29/45] udevCheckHook: remove broken cross-compilation check

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

diff --git a/pkgs/by-name/ud/udevCheckHook/package.nix b/pkgs/by-name/ud/udevCheckHook/package.nix
index 261a503595ea..681b5d5f7a06 100644
--- a/pkgs/by-name/ud/udevCheckHook/package.nix
+++ b/pkgs/by-name/ud/udevCheckHook/package.nix
@@ -2,15 +2,16 @@
   lib,
   makeSetupHook,
   systemdMinimal,
-  udev,
   stdenv,
 }:
 let
   # udev rules can only be checked if systemd (specifically, 'udevadm') can be executed on build platform
-  # if udev is not available on hostPlatform, there is no point in checking rules
-  applyHook =
-    lib.meta.availableOn stdenv.hostPlatform udev
-    && lib.meta.availableOn stdenv.buildPlatform systemdMinimal;
+  # If cross-compiling linux -> non-linux, udev rules are still checked, even if they end up being unused.
+  # This is not a problem:
+  # - If there are no udev rules, the hook is a noop
+  # - If the udev rules are broken, they should be flagged as such
+  # - if rules are not needed on a target platform where they are broken, they should be deleted from package output
+  applyHook = lib.meta.availableOn stdenv.buildPlatform systemdMinimal;
 in
 makeSetupHook {
   name = "udev-check-hook";

From 699e880b82e3f3770fc20fd5efa7320a0a08d783 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 May 2025 16:14:34 +0000
Subject: [PATCH 30/45] windsurf: 1.9.0 -> 1.9.2

---
 pkgs/by-name/wi/windsurf/info.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json
index a765700b327c..db9f6557b9de 100644
--- a/pkgs/by-name/wi/windsurf/info.json
+++ b/pkgs/by-name/wi/windsurf/info.json
@@ -1,20 +1,20 @@
 {
   "aarch64-darwin": {
-    "version": "1.9.0",
+    "version": "1.9.2",
     "vscodeVersion": "1.99.1",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/fbebfca390b10f7a152fd231f94606109d576e12/Windsurf-darwin-arm64-1.9.0.zip",
-    "sha256": "44706f90321bdc4c2a2320a03c79fdd01c911236daa4cc675c597851974a268c"
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/8cb7f313303c8b35844a56b6fe0f76e508261569/Windsurf-darwin-arm64-1.9.2.zip",
+    "sha256": "b3edf57d19fab5ceac0cd3daee3c54052e503b052efebad0b6bfeac3b9f5a979"
   },
   "x86_64-darwin": {
-    "version": "1.9.0",
+    "version": "1.9.2",
     "vscodeVersion": "1.99.1",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/fbebfca390b10f7a152fd231f94606109d576e12/Windsurf-darwin-x64-1.9.0.zip",
-    "sha256": "ae398d597cd143144c2bdc8bf0a853a1c57b6de2c86c95087a4be5db78252e75"
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/8cb7f313303c8b35844a56b6fe0f76e508261569/Windsurf-darwin-x64-1.9.2.zip",
+    "sha256": "227ed7b01b9f7637d126ef880b6e0c07daa263b0740e6394e32ad4ebedd05d78"
   },
   "x86_64-linux": {
-    "version": "1.9.0",
+    "version": "1.9.2",
     "vscodeVersion": "1.99.1",
-    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/fbebfca390b10f7a152fd231f94606109d576e12/Windsurf-linux-x64-1.9.0.tar.gz",
-    "sha256": "941640e3514a5ee524943135b439219243adb288fec484712ebc2935173aa938"
+    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/8cb7f313303c8b35844a56b6fe0f76e508261569/Windsurf-linux-x64-1.9.2.tar.gz",
+    "sha256": "ee5a4ac38f9a2518a54429cb235bae76d74b3fff0f5947dbfc29738d78f28542"
   }
 }

From 77cd83bb002a7863e0ce72e456228e96548a4734 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Sat, 31 May 2025 18:16:19 +0200
Subject: [PATCH 31/45] python313Packages.msmart-ng: 2025.3.3 -> 2025.5.1

https://github.com/mill1000/midea-msmart/releases/tag/2025.5.0

https://github.com/mill1000/midea-msmart/releases/tag/2025.5.1
---
 pkgs/development/python-modules/msmart-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/msmart-ng/default.nix b/pkgs/development/python-modules/msmart-ng/default.nix
index 8d1983474e18..d1564047c06b 100644
--- a/pkgs/development/python-modules/msmart-ng/default.nix
+++ b/pkgs/development/python-modules/msmart-ng/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "msmart-ng";
-  version = "2025.3.3";
+  version = "2025.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mill1000";
     repo = "midea-msmart";
     tag = version;
-    hash = "sha256-M8Gl6QXj0tRN7VFDhop47vINk8MeWSyCJ9bboo3j8Go=";
+    hash = "sha256-dZD93ZZiQLmWuMAR/nnYB7oGBBYr4YPEi+LdpSzweVc=";
   };
 
   patches = [

From c3c817012463aca5a60a3cbe6e63494dac3ffab5 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Sat, 31 May 2025 18:16:20 +0200
Subject: [PATCH 32/45] home-assistant-custom-components.midea_ac: 2025.4.0 ->
 2025.5.1

https://github.com/mill1000/midea-ac-py/releases/tag/2025.5.0

https://github.com/mill1000/midea-ac-py/releases/tag/2025.5.1
---
 .../home-assistant/custom-components/midea_ac/package.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix
index 848ff9370fc6..683abdf36d8d 100644
--- a/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/midea_ac/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "mill1000";
   domain = "midea_ac";
-  version = "2025.4.0";
+  version = "2025.5.1";
 
   src = fetchFromGitHub {
     owner = "mill1000";
     repo = "midea-ac-py";
     tag = version;
-    hash = "sha256-ZkLC0GhfN+jp1DWv30LNVCP+NEZywt9Pxycs2RWBzrM=";
+    hash = "sha256-6CNxhgygAyzpy3idj3RkVvI8WMHCfar9v0GG21Y7YKE=";
   };
 
   dependencies = [ msmart-ng ];

From 85f8ed8bea477fbfaafb07051e364f957f1364e9 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Sat, 31 May 2025 18:16:22 +0200
Subject: [PATCH 33/45] python313Packages.msmart-ng: drop no longer needed PEP
 639 revert

At the time, setuptools did not yet implement PEP 639. This has changed
with the release of setuptools v77.0.0, which has since landed in
nixpkgs. As such, this patch is no longer needed.

Ref: 7605633c219a4b3900b49cb1aaf3dafd562d80dc
---
 .../development/python-modules/msmart-ng/default.nix | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/development/python-modules/msmart-ng/default.nix b/pkgs/development/python-modules/msmart-ng/default.nix
index d1564047c06b..05ca5a840362 100644
--- a/pkgs/development/python-modules/msmart-ng/default.nix
+++ b/pkgs/development/python-modules/msmart-ng/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch2,
 
   # build-system
   setuptools,
@@ -28,17 +27,6 @@ buildPythonPackage rec {
     hash = "sha256-dZD93ZZiQLmWuMAR/nnYB7oGBBYr4YPEi+LdpSzweVc=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      # Revert <https://github.com/mill1000/midea-msmart/pull/209> until setuptools
-      # implements support for <https://peps.python.org/pep-0639/>.
-      name = "revert-pyproject-license-declaration-pep639-syntax.patch";
-      url = "https://github.com/mill1000/midea-msmart/commit/e5d6a982135e497c251095e421d3de4686f36056.patch?full_index=1";
-      hash = "sha256-+mxmFGZd04MZY2C5eo4k1lFoXsM8XyeJNazShnjAseE=";
-      revert = true;
-    })
-  ];
-
   build-system = [
     setuptools
     setuptools-scm

From 781b5ab851837e5f03cfd87e9a859dac9b7eefdd Mon Sep 17 00:00:00 2001
From: Jost Alemann <jost_alemann@me.com>
Date: Sat, 31 May 2025 19:04:51 +0200
Subject: [PATCH 34/45] readest: 0.9.50 -> 0.9.51

Changelog: https://github.com/readest/readest/releases/tag/v0.9.51
Diff: https://github.com/readest/readest/compare/v0.9.50...v0.9.51
---
 pkgs/by-name/re/readest/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix
index a742070d9344..5f065bca0b18 100644
--- a/pkgs/by-name/re/readest/package.nix
+++ b/pkgs/by-name/re/readest/package.nix
@@ -20,13 +20,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "readest";
-  version = "0.9.50";
+  version = "0.9.51";
 
   src = fetchFromGitHub {
     owner = "readest";
     repo = "readest";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/DWJZnGhJRBVdtieZBRLmF4Wfe/fo4YQTRT/FFCWUGg=";
+    hash = "sha256-UJ4H+pBR+EWr2O34WUmbF2rd3pTVssE/8b9iO9bbx7Y=";
     fetchSubmodules = true;
   };
 

From 9d94761374d8e7a75d6dca2a389a35454d1c9328 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 May 2025 17:48:54 +0000
Subject: [PATCH 35/45] vscode-extensions.angular.ng-template: 20.0.0 -> 20.0.1

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 9d8ad86b2c16..fbf20810a7a4 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -260,8 +260,8 @@ let
         mktplcRef = {
           name = "ng-template";
           publisher = "Angular";
-          version = "20.0.0";
-          hash = "sha256-87SImzcGbwvf9xtdbD3etqaWe6fMVeCKc+f8qTyFnUA=";
+          version = "20.0.1";
+          hash = "sha256-N+2uNX1gXGHAvkx2aff9DfB7vji8bXNLt86yaSYt0o0=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog";

From 960d4c5c8ea25422bfc00e5f7ac20d6c8a230782 Mon Sep 17 00:00:00 2001
From: t4ccer <t4ccer@gmail.com>
Date: Sun, 27 Apr 2025 23:02:13 -0600
Subject: [PATCH 36/45] python3Packages.cbor2: add option to build without C
 extensions

---
 pkgs/development/python-modules/cbor2/default.nix | 10 ++++++++++
 pkgs/top-level/python-packages.nix                |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix
index a3ed8ceea17f..a9fd9152666e 100644
--- a/pkgs/development/python-modules/cbor2/default.nix
+++ b/pkgs/development/python-modules/cbor2/default.nix
@@ -4,6 +4,8 @@
   fetchPypi,
   pythonOlder,
 
+  withCExtensions ? true,
+
   # build-system
   setuptools,
   setuptools-scm,
@@ -39,6 +41,14 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  env = lib.optionalAttrs (!withCExtensions) {
+    CBOR2_BUILD_C_EXTENSION = "0";
+  };
+
+  passthru = {
+    inherit withCExtensions;
+  };
+
   meta = with lib; {
     changelog = "https://github.com/agronholm/cbor2/releases/tag/${version}";
     description = "Python CBOR (de)serializer with extensive tag support";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 06abbbbc8174..0086e32ca015 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2282,6 +2282,10 @@ self: super: with self; {
 
   cbor2 = callPackage ../development/python-modules/cbor2 { };
 
+  cbor2WithoutCExtensions = callPackage ../development/python-modules/cbor2 {
+    withCExtensions = false;
+  };
+
   cccolutils = callPackage ../development/python-modules/cccolutils { krb5-c = pkgs.krb5; };
 
   cdcs = callPackage ../development/python-modules/cdcs { };

From 5eed3e10c5269f6e54f4ef7352fa22eda46b6994 Mon Sep 17 00:00:00 2001
From: t4ccer <t4ccer@gmail.com>
Date: Sun, 27 Apr 2025 22:47:27 -0600
Subject: [PATCH 37/45] python3Packages.pycardano: 0.12.3 -> 0.14

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

diff --git a/pkgs/development/python-modules/pycardano/default.nix b/pkgs/development/python-modules/pycardano/default.nix
index e5f164e9fe92..7b36de98ace2 100644
--- a/pkgs/development/python-modules/pycardano/default.nix
+++ b/pkgs/development/python-modules/pycardano/default.nix
@@ -25,7 +25,7 @@
 }:
 
 let
-  cose_0_9_dev8 = cose.overridePythonAttrs (old: rec {
+  cose_0_9_dev8 = (cose.override { inherit cbor2; }).overridePythonAttrs (old: rec {
     version = "0.9.dev8";
     src = (
       old.src.override {
@@ -38,14 +38,14 @@ let
 in
 buildPythonPackage rec {
   pname = "pycardano";
-  version = "0.12.3";
+  version = "0.14.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Python-Cardano";
     repo = "pycardano";
     tag = "v${version}";
-    hash = "sha256-jxgskdQ7Us+utndUgFYK7G2IW/e5QbeXytOsxQfFiJI=";
+    hash = "sha256-W5N254tND7mI0oR82YhMFWn4zVVs3ygYOqXOBMO3sXY=";
   };
 
   build-system = [
@@ -88,5 +88,9 @@ buildPythonPackage rec {
     homepage = "https://github.com/Python-Cardano/pycardano";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ t4ccer ];
+    # https://github.com/Python-Cardano/pycardano/blob/v0.13.2/Makefile#L26-L39
+    # cbor2 with C extensions fail tests due to differences in used sized vs unsized arrays
+    # more info: https://github.com/NixOS/nixpkgs/pull/402433#issuecomment-2916520286
+    broken = cbor2.withCExtensions; # consider overriding cbor2 with cbor2WithoutCExtensions
   };
 }

From c0ff075e471e9b7e564017ff31f11ecd1662da04 Mon Sep 17 00:00:00 2001
From: t4ccer <t4ccer@gmail.com>
Date: Sun, 27 Apr 2025 22:56:14 -0600
Subject: [PATCH 38/45] python3Packages.uplc: 1.0.7 -> 1.0.10

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

diff --git a/pkgs/development/python-modules/uplc/default.nix b/pkgs/development/python-modules/uplc/default.nix
index dd8e8cbea634..e9a2874b17c0 100644
--- a/pkgs/development/python-modules/uplc/default.nix
+++ b/pkgs/development/python-modules/uplc/default.nix
@@ -8,14 +8,16 @@
   setuptools,
   poetry-core,
   frozendict,
+  cbor2WithoutCExtensions,
   cbor2,
   rply,
   pycardano,
+  uplc,
 }:
 
 buildPythonPackage rec {
   pname = "uplc";
-  version = "1.0.7";
+  version = "1.0.10";
 
   format = "pyproject";
 
@@ -23,7 +25,7 @@ buildPythonPackage rec {
     owner = "OpShin";
     repo = "uplc";
     tag = version;
-    hash = "sha256-xK2k0XLybWqyP5Qa2Oby8YBgiiswR++yVK7NPgpdSa0=";
+    hash = "sha256-Owo4W4jChrdYnz11BbWQdm2SiwFwOJlqjYutuRyjpxs=";
   };
 
   propagatedBuildInputs = [
@@ -37,8 +39,17 @@ buildPythonPackage rec {
     python-secp256k1-cardano
   ];
 
+  # Support cbor2 without C extensions
+  postPatch = lib.optionalString (!cbor2.withCExtensions) ''
+    substituteInPlace uplc/ast.py --replace-fail 'from _cbor2' 'from cbor2'
+  '';
+
   pythonImportsCheck = [ "uplc" ];
 
+  passthru.tests.withoutCExtensions = uplc.override {
+    cbor2 = cbor2WithoutCExtensions;
+  };
+
   meta = with lib; {
     description = "Python implementation of untyped plutus language core";
     homepage = "https://github.com/OpShin/uplc";

From cc81296dba7c7d36df947a9c56416209eee68acd Mon Sep 17 00:00:00 2001
From: t4ccer <t4ccer@gmail.com>
Date: Sun, 27 Apr 2025 22:31:16 -0600
Subject: [PATCH 39/45] opshin: 0.24.1 -> 0.24.2

---
 pkgs/by-name/op/opshin/package.nix | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/op/opshin/package.nix b/pkgs/by-name/op/opshin/package.nix
index 73f663a60815..b5c8c8fcce65 100644
--- a/pkgs/by-name/op/opshin/package.nix
+++ b/pkgs/by-name/op/opshin/package.nix
@@ -4,9 +4,20 @@
   python3,
 }:
 
-python3.pkgs.buildPythonApplication rec {
+let
+  python3' = python3.override {
+    self = python3;
+    packageOverrides = (
+      final: prev: {
+        cbor2 = prev.cbor2WithoutCExtensions;
+      }
+    );
+  };
+in
+
+python3'.pkgs.buildPythonApplication rec {
   pname = "opshin";
-  version = "0.24.1";
+  version = "0.24.2";
 
   format = "pyproject";
 
@@ -14,10 +25,10 @@ python3.pkgs.buildPythonApplication rec {
     owner = "OpShin";
     repo = "opshin";
     tag = version;
-    hash = "sha256-+uuTEszA5p/qhvthM3Uje6yX3urbIUAKKfDZ4JXEYYQ=";
+    hash = "sha256-L0vWEXlghXssT9oUw5AYG3/4ALoB/NH90JV8Kdl2n30=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  propagatedBuildInputs = with python3'.pkgs; [
     setuptools
     poetry-core
     uplc
@@ -28,11 +39,6 @@ python3.pkgs.buildPythonApplication rec {
     ordered-set
   ];
 
-  pythonRelaxDeps = [
-    "pluthon"
-    "uplc"
-  ];
-
   meta = with lib; {
     description = "Simple pythonic programming language for Smart Contracts on Cardano";
     homepage = "https://opshin.dev";

From 2605d3a9dbf9ac92632bbfb1e7dd41187ada2f48 Mon Sep 17 00:00:00 2001
From: diniamo <diniamo53@gmail.com>
Date: Sat, 31 May 2025 20:24:21 +0200
Subject: [PATCH 40/45] discord: allow not disabling updates

---
 .../networking/instant-messengers/discord/linux.nix         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix
index bf94609409a8..be1542797e95 100644
--- a/pkgs/applications/networking/instant-messengers/discord/linux.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix
@@ -66,6 +66,10 @@
   moonlight,
   withTTS ? true,
   enableAutoscroll ? false,
+  # Disabling this would normally break Discord.
+  # The intended use-case for this is when SKIP_HOST_UPDATE is enabled via other means,
+  # for example if a settings.json is linked declaratively (e.g., with home-manager).
+  disableUpdates ? true,
 }:
 assert lib.assertMsg (
   !(withMoonlight && withVencord)
@@ -180,7 +184,7 @@ stdenv.mkDerivation rec {
         ${lib.strings.optionalString enableAutoscroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \
         --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
         --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} \
-        --run "${lib.getExe disableBreakingUpdates}"
+        ${lib.strings.optionalString disableUpdates "--run ${lib.getExe disableBreakingUpdates}"}
 
     ln -s $out/opt/${binaryName}/${binaryName} $out/bin/
     # Without || true the install would fail on case-insensitive filesystems

From 0e1314e81f434590bfa6ca3b909e6c693b9e34dd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 May 2025 20:08:43 +0000
Subject: [PATCH 41/45] iosevka: 33.2.3 -> 33.2.4

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

diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix
index 78f4152180ca..612124426426 100644
--- a/pkgs/by-name/io/iosevka/package.nix
+++ b/pkgs/by-name/io/iosevka/package.nix
@@ -56,16 +56,16 @@ assert (extraParameters != null) -> set != null;
 
 buildNpmPackage rec {
   pname = "Iosevka${toString set}";
-  version = "33.2.3";
+  version = "33.2.4";
 
   src = fetchFromGitHub {
     owner = "be5invis";
     repo = "iosevka";
     rev = "v${version}";
-    hash = "sha256-dCHJYGZYTvjDtM2V+NdwXNxHg4kkcVAQD0G3DPtu5ps=";
+    hash = "sha256-1QxM9PWZirAKIdd/kzHLDStXbkxTGr0q8GQSER2NEXc=";
   };
 
-  npmDepsHash = "sha256-eqWf5d9uCMkvDNPlICUt7QVT+2WsU0u+TE14ZraWXXE=";
+  npmDepsHash = "sha256-1XRbwd1x7ofQGnEth7U8QAHX92QDHMm4OmQAQgZZLTw=";
 
   nativeBuildInputs =
     [

From 24134e86b7efc45f8dc9a4445d4c7ff55748731e Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sat, 31 May 2025 13:21:48 -0700
Subject: [PATCH 42/45] k3s.tests: fix eval

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

diff --git a/nixos/tests/k3s/default.nix b/nixos/tests/k3s/default.nix
index 5240f029139f..8d4203c1fb79 100644
--- a/nixos/tests/k3s/default.nix
+++ b/nixos/tests/k3s/default.nix
@@ -8,7 +8,7 @@ let
     n: _: lib.strings.hasPrefix "k3s_" n && (builtins.tryEval pkgs.${n}).success
   ) pkgs;
 in
-lib.recurseIntoAttrs {
+{
   airgap-images = lib.mapAttrs (
     _: k3s: import ./airgap-images.nix { inherit system pkgs k3s; }
   ) allK3s;

From 2bdf5120fcf87bd77bb9e29257fba1d3f00f946c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 May 2025 21:27:02 +0000
Subject: [PATCH 43/45] beam26Packages.ex_doc: 0.38.1 -> 0.38.2

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

diff --git a/pkgs/development/beam-modules/ex_doc/default.nix b/pkgs/development/beam-modules/ex_doc/default.nix
index 0aa06e6a2047..9638843ed8b7 100644
--- a/pkgs/development/beam-modules/ex_doc/default.nix
+++ b/pkgs/development/beam-modules/ex_doc/default.nix
@@ -14,12 +14,12 @@
 
 let
   pname = "ex_doc";
-  version = "0.38.1";
+  version = "0.38.2";
   src = fetchFromGitHub {
     owner = "elixir-lang";
     repo = "${pname}";
     rev = "v${version}";
-    hash = "sha256-lsz+r/7Pre15qWOqla9j712I6HExyHfvBfupmKuePmI=";
+    hash = "sha256-Qv1vDfDGquWoem42IqA8lDiFWEtznT7ONIXSOCvn39g=";
   };
 in
 mixRelease {

From 9270558242e1a488d5ee8989fa39b55c1748c054 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 May 2025 07:54:19 +0000
Subject: [PATCH 44/45] snakemake: 9.5.0 -> 9.5.1

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

diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix
index 8bece95eea5d..49f8200f1499 100644
--- a/pkgs/by-name/sn/snakemake/package.nix
+++ b/pkgs/by-name/sn/snakemake/package.nix
@@ -10,14 +10,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "snakemake";
-  version = "9.5.0";
+  version = "9.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake";
     tag = "v${version}";
-    hash = "sha256-rZTx/ZDAaZ579u7ef18qlTUtg1ieWd9sF9UXvEOyLMk=";
+    hash = "sha256-cSFqPSLeM7hw1bxQZ2FhlHUP+O3iyrwBz4+Jz90Zck8=";
   };
 
   postPatch = ''

From e277203a2ea3ea07f899eb55119ce55185e9d54a Mon Sep 17 00:00:00 2001
From: Antonio <vozaanthony@gmail.com>
Date: Sun, 1 Jun 2025 00:55:13 +0200
Subject: [PATCH 45/45] sweet: 5.0 -> 6.0

---
 pkgs/by-name/sw/sweet/package.nix | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/sw/sweet/package.nix b/pkgs/by-name/sw/sweet/package.nix
index 51763fb1b974..77dc46c06e07 100644
--- a/pkgs/by-name/sw/sweet/package.nix
+++ b/pkgs/by-name/sw/sweet/package.nix
@@ -30,56 +30,56 @@ lib.checkListOfEnum "${pname}: color variants" colorVariantList colorVariants
   stdenvNoCC.mkDerivation
   (finalAttrs: {
     inherit pname;
-    version = "5.0";
+    version = "6.0";
 
     srcs = [
       (fetchurl {
         url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue-Dark-v40.tar.xz";
-        hash = "sha256-fCCkkEYr4XPnP5aPrs3HAwIwM/Qb0NFY8Rf1ABu0ygY=";
+        hash = "sha256-LufK9MexE6YMuVniyfcNNaPfVLBMHnNmWBBNnGA2nUo=";
       })
       (fetchurl {
         url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue-Dark.tar.xz";
-        hash = "sha256-xMAqUsol1FPeFoq8KLTmKCeZMF34FDAjhiagsRmjGT8=";
+        hash = "sha256-J0YOADP4FXKYMl/Nn70clD3h7Y5LtlTfWV9VLsWL9yo=";
       })
       (fetchurl {
         url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue-v40.tar.xz";
-        hash = "sha256-JlpomJ8Ao4bJFJbCDliRtxNckEG3LzINBqhWzfTARJs=";
+        hash = "sha256-HH9oZQ+F1nFhIJyP9d9W2CL+mA0bolq5GiNQtKQgrZk=";
       })
       (fetchurl {
         url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-Blue.tar.xz";
-        hash = "sha256-HKJ/Ca5cy91kJZVEETyMcOcrgLliHF/S2rdBmWfKi08=";
+        hash = "sha256-2dcryd5Zj+Iu3R4jR++uJtyToGNoa1LtTpN1G6+kBRw=";
       })
       (fetchurl {
         url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar-v40.tar.xz";
-        hash = "sha256-0LjARDbSPyQWN5nT97k2c//eebxhgStGYsebpNQn9+w=";
+        hash = "sha256-mpShu1fmBajl/wzlnu9zBWkskMlza5nEVS3u8Sh3b7s=";
       })
       (fetchurl {
         url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Ambar.tar.xz";
-        hash = "sha256-UjH4popJCqQ18HZUngsO6cE4axSAM7/EXwM8nHAdVS4=";
+        hash = "sha256-wcbJW6MUctGSM8GW1ouLvUCmdcDHQkjTw9h0foRBgTg=";
       })
       (fetchurl {
         url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Dark-v40.tar.xz";
-        hash = "sha256-4/e81slrkcO3WdrQ2atGHdZsErlzme4mRImfLvmGJnQ=";
+        hash = "sha256-aYPjnOEZMN9mPvnhK3eoCm1ybUxKPqPSoOL+kwsZsG4=";
       })
       (fetchurl {
         url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-Dark.tar.xz";
-        hash = "sha256-Tv+xtUee1TIdRLlnP84aVfk+V6xgeeeICRZCdeSSjE8=";
+        hash = "sha256-Ej9p7/txrMhGUCyDTAEQHIS/pi92pfLrCV1L4HxWdZk=";
       })
       (fetchurl {
         url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-mars-v40.tar.xz";
-        hash = "sha256-FmJoPeQ8iLA6X6lFawBqG8lviQXWBHG5lgQsZvU68BM=";
+        hash = "sha256-AKTNa6FHlPr1ZqlK5QYZzXRiPb5Nmzw2lTSNcWAtMAg=";
       })
       (fetchurl {
         url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-mars.tar.xz";
-        hash = "sha256-bqL9jR8yPF9ZnEZ1O+P3/e6E59m+MY7mQNT3BhYVhu4=";
+        hash = "sha256-bCL/DqiQGiHR24aaPtPyJKAkk8X+DyMxYeYuFJBuK6Y=";
       })
       (fetchurl {
         url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet-v40.tar.xz";
-        hash = "sha256-Oesx/McKmTlqwJX8u6RrV3AtOIB73BQveD8slbD14js=";
+        hash = "sha256-1kHWoK9r3mRYIkizekVVYyFpWXU78BExKuNUsRB4uv4=";
       })
       (fetchurl {
         url = "https://github.com/EliverLara/Sweet/releases/download/v${finalAttrs.version}/Sweet.tar.xz";
-        hash = "sha256-m0tQHV/3UkDoOAmBZF6Nvugj6fEkmLbeLPdQ/IFkHOo=";
+        hash = "sha256-WzsquuUreT7b6TA6qGSYqGVrVWlIdQjlIdqWGMNJFpo=";
       })
     ];