From 59a04e2da8f7d277609aa59ef9f73f77cc3d01c2 Mon Sep 17 00:00:00 2001
From: Timon Schelling <me@timon.zip>
Date: Sat, 24 May 2025 20:02:06 +0000
Subject: [PATCH 01/59] maintainer: add timon

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 77f949a68e16..1db09ee2e73f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -24893,6 +24893,13 @@
     githubId = 3799330;
     name = "Timo Kaufmann";
   };
+  timon = {
+    name = "Timon Schelling";
+    email = "me@timon.zip";
+    matrix = "@timon:beeper.com";
+    github = "timon-schelling";
+    githubId = 36821505;
+  };
   timor = {
     email = "timor.dd@googlemail.com";
     github = "timor";

From e82c7e5b8350bb36e56091477541a1d89763f46b Mon Sep 17 00:00:00 2001
From: Thomas BESSOU <thomas.bessou@hotmail.fr>
Date: Mon, 16 Jun 2025 12:03:00 +0200
Subject: [PATCH 02/59] nixos/i3: fix i3lock default enable-ing

Prior to this commit, i3lock was enabled by default in a way that doesn't work as of https://github.com/NixOS/nixpkgs/commit/317c972e8af2092c95e1f30028f8b7366b4ab4b9#diff-aef862f6fd2c25092a3f17f974d8757285bf7baff6b80822cd142b7de1903ccfR451-R454
Users attempting to use i3lock with this default setup would get locked out of their system.

This fixes it by enabling i3lock via its `programs` option instead of specifying the package directly.

Discussion over at https://github.com/NixOS/nixpkgs/issues/401891#issuecomment-2963378189
---
 nixos/modules/services/x11/window-managers/i3.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/i3.nix b/nixos/modules/services/x11/window-managers/i3.nix
index 47c927b85456..ea594a1ee585 100644
--- a/nixos/modules/services/x11/window-managers/i3.nix
+++ b/nixos/modules/services/x11/window-managers/i3.nix
@@ -52,13 +52,11 @@ in
       default = with pkgs; [
         dmenu
         i3status
-        i3lock
       ];
       defaultText = literalExpression ''
         with pkgs; [
           dmenu
           i3status
-          i3lock
         ]
       '';
       description = ''
@@ -81,6 +79,7 @@ in
         '';
       }
     ];
+    programs.i3lock.enable = mkDefault true;
     environment.systemPackages = [ cfg.package ] ++ cfg.extraPackages;
     environment.etc."i3/config" = mkIf (cfg.configFile != null) {
       source = cfg.configFile;

From ddb314accd15387de64e8b532f292a6aa2945958 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Jun 2025 10:16:09 +0000
Subject: [PATCH 03/59] kimai: 2.35.1 -> 2.36.1

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

diff --git a/pkgs/by-name/ki/kimai/package.nix b/pkgs/by-name/ki/kimai/package.nix
index 3213062cf3f7..218292c47b21 100644
--- a/pkgs/by-name/ki/kimai/package.nix
+++ b/pkgs/by-name/ki/kimai/package.nix
@@ -7,13 +7,13 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "kimai";
-  version = "2.35.1";
+  version = "2.36.1";
 
   src = fetchFromGitHub {
     owner = "kimai";
     repo = "kimai";
     tag = finalAttrs.version;
-    hash = "sha256-QcrlwKpnKuTrJ7U8BzUsxKnJoFzV/U+ZUj5v8FcJXvI=";
+    hash = "sha256-TZMkCKwfmn2Iv1BXKH49NRB6oCIKlPmkrPcLNZlyaPo=";
   };
 
   php = php.buildEnv {
@@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-hENucMcLgG6w0hUF/tnXvFYssgqQLspD+36Jl4cJmig=";
+  vendorHash = "sha256-ROy/ZWVOZ6fM92kV94uPiyUudmuCpK+9zE/5xzd+BQc=";
 
   composerNoPlugins = false;
   composerNoScripts = false;

From 4d18fb7736283b6ddc99431c1f054a82e07b6fce Mon Sep 17 00:00:00 2001
From: Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
Date: Thu, 19 Jun 2025 04:34:07 -0400
Subject: [PATCH 04/59] firefox-devedition: fix remoting name

---
 .../browsers/firefox/packages/firefox-devedition.nix     | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
index 45ad9b2a0d2f..f9f991475be4 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
@@ -19,6 +19,15 @@ buildMozillaMach rec {
     sha512 = "c653824a5be5e376f53bd73589760af6bb74d7ee66f6557ec9fda4e3d795a851f49d73c063abac69aa6663f7f8b3c76b9487d0c067e33bd1c2be7733b9356325";
   };
 
+  # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but
+  # unfortunately if the branding file also defines MOZ_APP_REMOTINGNAME, the
+  # branding file takes precedence. ("aurora" is the only branding to do this,
+  # so far.) We remove it so that the name set in buildMozillaMach takes
+  # effect.
+  extraPostPatch = ''
+    sed -i '/^MOZ_APP_REMOTINGNAME=/d' browser/branding/aurora/configure.sh
+  '';
+
   meta = {
     changelog = "https://www.mozilla.org/en-US/firefox/${lib.versions.majorMinor version}beta/releasenotes/";
     description = "Web browser built from Firefox Developer Edition source tree";

From 9d48976ccc86a60e86f94b647894462cb0a8a481 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Jun 2025 07:09:42 +0000
Subject: [PATCH 05/59] git-extras: 7.3.0 -> 7.4.0

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

diff --git a/pkgs/by-name/gi/git-extras/package.nix b/pkgs/by-name/gi/git-extras/package.nix
index 630542f0e4e0..46e55e487356 100644
--- a/pkgs/by-name/gi/git-extras/package.nix
+++ b/pkgs/by-name/gi/git-extras/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "git-extras";
-  version = "7.3.0";
+  version = "7.4.0";
 
   src = fetchFromGitHub {
     owner = "tj";
     repo = "git-extras";
     rev = version;
-    sha256 = "sha256-0XZwEhDjh+rL6ZEWb60+GUw7hFOS3Xr32hgPNJcOL9I=";
+    sha256 = "sha256-xxBmOAJgoVR+K3gEM5KFKyWenwFnar+zF26HnTG5vuw=";
   };
 
   postPatch = ''

From 3f0aff97b1b8d23fbc91797da8a10f2a18fffb1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 20 Jun 2025 16:45:20 -0700
Subject: [PATCH 06/59] python3Packages.slack-sdk: fix test

---
 pkgs/development/python-modules/slack-sdk/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix
index f8855e4c760a..7e5cb4ba0935 100644
--- a/pkgs/development/python-modules/slack-sdk/default.nix
+++ b/pkgs/development/python-modules/slack-sdk/default.nix
@@ -6,6 +6,7 @@
   boto3,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   flake8,
   moto,
   psutil,
@@ -30,6 +31,14 @@ buildPythonPackage rec {
     hash = "sha256-yjYpALyHSTLQSuwd6xth7nqfi3m1C9tqnWrrVRmI220=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "fix-aiohttp-test_init_with_loop.patch";
+      url = "https://github.com/slackapi/python-slack-sdk/pull/1697.patch";
+      hash = "sha256-rHaJBH/Yxm3Sz/jmzc4G1pVJJXz0PL2880bz5n7w3ck=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [

From 7faa5c3b58f9d001548a0ea863ae8068600a42b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 20 Jun 2025 16:44:21 -0700
Subject: [PATCH 07/59] python3Packages.slack-sdk: clean up dependencies

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

diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix
index 7e5cb4ba0935..6093778bd751 100644
--- a/pkgs/development/python-modules/slack-sdk/default.nix
+++ b/pkgs/development/python-modules/slack-sdk/default.nix
@@ -7,9 +7,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   fetchpatch,
-  flake8,
   moto,
-  psutil,
   pytest-asyncio,
   pytestCheckHook,
   setuptools,
@@ -41,10 +39,9 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies = [
+  optional-dependencies.optional = [
     aiodns
     aiohttp
-    aiosqlite
     boto3
     sqlalchemy
     websocket-client
@@ -54,12 +51,11 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "slack_sdk" ];
 
   nativeCheckInputs = [
-    flake8
+    aiosqlite
     moto
-    psutil
     pytest-asyncio
     pytestCheckHook
-  ];
+  ] ++ optional-dependencies.optional;
 
   disabledTests = [
     # Requires internet access (to slack API)

From f2e8fd782141e0ebd2d2ec30947b254e1ad30313 Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Sat, 21 Jun 2025 19:01:22 +0200
Subject: [PATCH 08/59] victorialogs: init at 1.24.0

---
 pkgs/by-name/vi/victorialogs/package.nix | 72 ++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 pkgs/by-name/vi/victorialogs/package.nix

diff --git a/pkgs/by-name/vi/victorialogs/package.nix b/pkgs/by-name/vi/victorialogs/package.nix
new file mode 100644
index 000000000000..a6b2105685cb
--- /dev/null
+++ b/pkgs/by-name/vi/victorialogs/package.nix
@@ -0,0 +1,72 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+  nixosTests,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "VictoriaLogs";
+  version = "1.24.0";
+
+  src = fetchFromGitHub {
+    owner = "VictoriaMetrics";
+    repo = "VictoriaMetrics";
+    tag = "v${finalAttrs.version}-victorialogs";
+    hash = "sha256-E52hvxazzbz9FcPFZFcRHs2vVg6fJJQ8HsieQovQSi4=";
+  };
+
+  vendorHash = null;
+
+  subPackages = [
+    "app/victoria-logs"
+    "app/vlinsert"
+    "app/vlselect"
+    "app/vlstorage"
+    "app/vlogsgenerator"
+    "app/vlogscli"
+  ];
+
+  postPatch = ''
+    # main module (github.com/VictoriaMetrics/VictoriaMetrics) does not contain package
+    # github.com/VictoriaMetrics/VictoriaMetrics/app/vmui/packages/vmui/web
+    #
+    # This appears to be some kind of test server for development purposes only.
+    # rm -f app/vmui/packages/vmui/web/{go.mod,main.go}
+
+    # Increase timeouts in tests to prevent failure on heavily loaded builders
+    substituteInPlace lib/storage/storage_test.go \
+      --replace-fail "time.After(10 " "time.After(120 " \
+      --replace-fail "time.NewTimer(30 " "time.NewTimer(120 " \
+      --replace-fail "time.NewTimer(time.Second * 10)" "time.NewTimer(time.Second * 120)" \
+  '';
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${finalAttrs.version}"
+  ];
+
+  preCheck = ''
+    # `lib/querytracer/tracer_test.go` expects `buildinfo.Version` to be unset
+    export ldflags=''${ldflags//=${finalAttrs.version}/=}
+  '';
+
+  __darwinAllowLocalNetworking = true;
+
+  passthru = {
+    updateScript = nix-update-script {
+      extraArgs = [ "--version-regex=(.*)-victorialogs" ];
+    };
+  };
+
+  meta = {
+    homepage = "https://docs.victoriametrics.com/victorialogs/";
+    description = "User friendly log database from VictoriaMetrics";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ marie ];
+    changelog = "https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/${finalAttrs.src.tag}";
+    mainProgram = "victoria-logs";
+  };
+})

From b9a699fe22f9ac5f54edaa0bf4af0eb31fc9fcf2 Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Sat, 21 Jun 2025 19:06:41 +0200
Subject: [PATCH 09/59] nixos/victorialogs: use pkgs.victorialogs by default

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

diff --git a/nixos/modules/services/databases/victorialogs.nix b/nixos/modules/services/databases/victorialogs.nix
index 9d1324b2821e..8a246ad666e3 100644
--- a/nixos/modules/services/databases/victorialogs.nix
+++ b/nixos/modules/services/databases/victorialogs.nix
@@ -28,7 +28,7 @@ in
 {
   options.services.victorialogs = {
     enable = mkEnableOption "VictoriaLogs is an open source user-friendly database for logs from VictoriaMetrics";
-    package = mkPackageOption pkgs "victoriametrics" { };
+    package = mkPackageOption pkgs "victorialogs" { };
     listenAddress = mkOption {
       default = ":9428";
       type = types.str;

From ebfbc036efb47330c335442b69399a6c6726ed5f Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Sat, 21 Jun 2025 19:05:49 +0200
Subject: [PATCH 10/59] victoriametrics: remove withVictoriaLogs option

---
 pkgs/by-name/vi/victoriametrics/package.nix | 7 -------
 pkgs/by-name/vm/vmagent/package.nix         | 1 -
 2 files changed, 8 deletions(-)

diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix
index 5d9cd54783a6..b4a72734f194 100644
--- a/pkgs/by-name/vi/victoriametrics/package.nix
+++ b/pkgs/by-name/vi/victoriametrics/package.nix
@@ -9,7 +9,6 @@
   withVmAuth ? true, # HTTP proxy for authentication
   withBackupTools ? true, # vmbackup, vmrestore
   withVmctl ? true, # vmctl is used to migrate time series
-  withVictoriaLogs ? true, # logs server
 }:
 
 buildGoModule (finalAttrs: {
@@ -43,12 +42,6 @@ buildGoModule (finalAttrs: {
     ++ lib.optionals withBackupTools [
       "app/vmbackup"
       "app/vmrestore"
-    ]
-    ++ lib.optionals withVictoriaLogs [
-      "app/victoria-logs"
-      "app/vlinsert"
-      "app/vlselect"
-      "app/vlstorage"
     ];
 
   postPatch = ''
diff --git a/pkgs/by-name/vm/vmagent/package.nix b/pkgs/by-name/vm/vmagent/package.nix
index 650ad38f0a40..b1c8f33bcb50 100644
--- a/pkgs/by-name/vm/vmagent/package.nix
+++ b/pkgs/by-name/vm/vmagent/package.nix
@@ -6,7 +6,6 @@
 lib.addMetaAttrs { mainProgram = "vmagent"; } (
   victoriametrics.override {
     withServer = false;
-    withVictoriaLogs = false;
     withVmAlert = false;
     withVmAuth = false;
     withBackupTools = false;

From 3f9e587d444f7fbab1d10bacaff787051a4f31e9 Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Sat, 21 Jun 2025 19:07:56 +0200
Subject: [PATCH 11/59] nixos/tests/victorialogs: init

---
 nixos/tests/all-tests.nix                |  1 +
 nixos/tests/victorialogs.nix             | 26 ++++++++++++++++++++++++
 pkgs/by-name/vi/victorialogs/package.nix |  5 +++++
 3 files changed, 32 insertions(+)
 create mode 100644 nixos/tests/victorialogs.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 60d118cba38f..785db51e255a 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1469,6 +1469,7 @@ in
   vector = import ./vector { inherit runTest; };
   velocity = runTest ./velocity.nix;
   vengi-tools = runTest ./vengi-tools.nix;
+  victorialogs = runTest ./victorialogs.nix;
   victoriametrics = handleTest ./victoriametrics { };
   vikunja = runTest ./vikunja.nix;
   virtualbox = handleTestOn [ "x86_64-linux" ] ./virtualbox.nix { };
diff --git a/nixos/tests/victorialogs.nix b/nixos/tests/victorialogs.nix
new file mode 100644
index 000000000000..9545b61c402f
--- /dev/null
+++ b/nixos/tests/victorialogs.nix
@@ -0,0 +1,26 @@
+{ lib, ... }:
+{
+  name = "victorialogs";
+  meta.maintainers = with lib.maintainers; [ marie ];
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      services.victorialogs.enable = true;
+
+      services.journald.upload = {
+        enable = true;
+        settings = {
+          Upload.URL = "http://localhost:9428/insert/journald";
+        };
+      };
+      environment.systemPackages = [ pkgs.curl ];
+    };
+
+  testScript = ''
+    machine.wait_for_unit("victorialogs.service")
+
+    machine.succeed("echo 'meow' | systemd-cat -p info")
+    machine.wait_until_succeeds("curl --fail http://localhost:9428/select/logsql/query -d 'query=\"meow\"' | grep meow")
+  '';
+}
diff --git a/pkgs/by-name/vi/victorialogs/package.nix b/pkgs/by-name/vi/victorialogs/package.nix
index a6b2105685cb..a84434bc9520 100644
--- a/pkgs/by-name/vi/victorialogs/package.nix
+++ b/pkgs/by-name/vi/victorialogs/package.nix
@@ -56,6 +56,11 @@ buildGoModule (finalAttrs: {
   __darwinAllowLocalNetworking = true;
 
   passthru = {
+    tests = {
+      inherit (nixosTests)
+        victorialogs
+        ;
+    };
     updateScript = nix-update-script {
       extraArgs = [ "--version-regex=(.*)-victorialogs" ];
     };

From 5f5df9b7ad7c9892a3d98966a55763e925eb898b Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Sat, 21 Jun 2025 19:48:12 +0200
Subject: [PATCH 12/59] doc/rl-2511: document victorialogs package migration

---
 doc/release-notes/rl-2511.section.md              | 2 ++
 nixos/doc/manual/release-notes/rl-2511.section.md | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index c9547663b129..92dfc10d1100 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -20,6 +20,8 @@
 - `space-orbit` package has been removed due to lack of upstream maintenance. Debian upstream stopped tracking it in 2011.
 - `command-not-found` package is now disabled by default; it works only for nix-channels based systems, and requires setup for it to work.
 
+- `victoriametrics` no longer contains VictoriaLogs components. These have been separated into the new package `victorialogs`.
+
 - `gnome-keyring` no longer ships with an SSH agent anymore because it has been deprecated upstream. You should use `gcr_4` instead, which provides the same features. More information on why this was done can be found on [the relevant GCR upstream PR](https://gitlab.gnome.org/GNOME/gcr/-/merge_requests/67).
 
 - `lima` package now only includes the guest agent for the host's architecture by default. If your guest VM's architecture differs from your Lima host's, you'll need to enable the `lima-additional-guestagents` package by setting `withAdditionalGuestAgents = true` when overriding lima with this input.
diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 295d9ede7118..e88bf7b54d89 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -76,6 +76,8 @@
 
 - `vmalert` now supports multiple instances with the option `services.vmalert.instances."".enable`
 
+- [`services.victorialogs.package`](#opt-services.victorialogs.package) now defaults to `victorialogs`, as `victoriametrics` no longer contains the VictoriaLogs binaries.
+
 - The `wstunnel` module was converted to RFC42-style settings, you will need to update your NixOS config if you make use of this module.
 
 ## Other Notable Changes {#sec-release-25.11-notable-changes}

From 20ccea0556a8d08fcd070c3f1277e3f6bfb27262 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Jun 2025 05:15:15 +0000
Subject: [PATCH 13/59] mise: 2025.6.2 -> 2025.6.5

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

diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix
index 9c00c708bf35..bb2658b20e4a 100644
--- a/pkgs/by-name/mi/mise/package.nix
+++ b/pkgs/by-name/mi/mise/package.nix
@@ -21,17 +21,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mise";
-  version = "2025.6.2";
+  version = "2025.6.5";
 
   src = fetchFromGitHub {
     owner = "jdx";
     repo = "mise";
     rev = "v${version}";
-    hash = "sha256-vptTQdP7r9m328DK7USB6bV7muLVPIkZG8596nfdNQ8=";
+    hash = "sha256-aSiIhR7Lg5bBt/0YmuqcSbl4PiNXMrt6ok+e/IAt19s=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-0PS3WWQo3+fJ2TivvRalYCzDFmNxPRZStJj13kAP9bg=";
+  cargoHash = "sha256-+4y3/EZVIcfnkqU4krXovnfZNZw1luHH4VxgAERry8U=";
 
   nativeBuildInputs = [
     installShellFiles

From b52821ab35eb76d4a226d842aff38d5c5fc16618 Mon Sep 17 00:00:00 2001
From: Dan Xin <davinci42.cn@gmail.com>
Date: Sun, 22 Jun 2025 19:22:21 +0800
Subject: [PATCH 14/59] ffsubsync: remove future dependency

---
 pkgs/by-name/ff/ffsubsync/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ff/ffsubsync/package.nix b/pkgs/by-name/ff/ffsubsync/package.nix
index 5e7e1dea7679..227181e043aa 100644
--- a/pkgs/by-name/ff/ffsubsync/package.nix
+++ b/pkgs/by-name/ff/ffsubsync/package.nix
@@ -23,7 +23,6 @@ python3.pkgs.buildPythonApplication rec {
     charset-normalizer
     faust-cchardet
     ffmpeg-python
-    future
     numpy
     pkgs.ffmpeg
     pysubs2

From 7f1caf53226408a3d498ff4e71439a58209929db Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 20 Jun 2025 23:46:09 +0800
Subject: [PATCH 15/59] pantheon.elementary-code: 7.4.0 -> 8.0.0

https://github.com/elementary/code/compare/7.4.0...8.0.0
---
 .../pantheon/apps/elementary-code/default.nix | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
index 673d06b33bf7..1a838e61759e 100644
--- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
@@ -2,9 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   nix-update-script,
-  appstream,
-  desktop-file-utils,
   meson,
   ninja,
   pkg-config,
@@ -19,26 +18,35 @@
   libgee,
   libgit2-glib,
   libhandy,
-  libpeas,
-  libsoup_2_4,
+  libpeas2,
+  libsoup_3,
   vte,
   ctags,
 }:
 
 stdenv.mkDerivation rec {
   pname = "elementary-code";
-  version = "7.4.0";
+  version = "8.0.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "code";
     rev = version;
-    sha256 = "sha256-KoRpGBYen1eOdMBHOTBMopC+mPMOkD+iYWV3JA21mKc=";
+    hash = "sha256-muW7K9cFITZaoNi3id+iplmokN5sSE8x1CVQ62+myUU=";
   };
 
+  patches = [
+    # Fix build with GCC 14
+    # https://github.com/elementary/code/pull/1606
+    (fetchpatch {
+      url = "https://github.com/elementary/code/commit/9b8347adcbb94f3186815413d927eecc51be2ccf.patch";
+      hash = "sha256-VhpvWgOGniOEjxBOjvX30DZIRGalxfPlb9j1VaOAJTA=";
+    })
+  ];
+
+  strictDeps = true;
+
   nativeBuildInputs = [
-    appstream
-    desktop-file-utils
     meson
     ninja
     pkg-config
@@ -56,8 +64,9 @@ stdenv.mkDerivation rec {
     libgee
     libgit2-glib
     libhandy
-    libpeas
-    libsoup_2_4
+    libpeas2
+    libsoup_3
+    vala # for ValaSymbolResolver provided by libvala
     vte
   ];
 

From 004ba2b82737d6755855ff9097656927d0423cc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 22 Jun 2025 16:04:10 +0200
Subject: [PATCH 16/59] freerdp: 3.15.0-unstable-2025-05-16 -> 3.16.0

Changelog: https://github.com/FreeRDP/FreeRDP/releases/tag/3.16.0
---
 pkgs/by-name/fr/freerdp/package.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/fr/freerdp/package.nix b/pkgs/by-name/fr/freerdp/package.nix
index 340e0e1704eb..f8a72d6f8010 100644
--- a/pkgs/by-name/fr/freerdp/package.nix
+++ b/pkgs/by-name/fr/freerdp/package.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch2,
   cmake,
   writableTmpDirAsHomeHook,
   docbook-xsl-nons,
@@ -64,24 +63,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "freerdp";
-  version = "3.15.0-unstable-2025-05-16";
+  version = "3.16.0";
 
   src = fetchFromGitHub {
     owner = "FreeRDP";
     repo = "FreeRDP";
     rev = finalAttrs.version;
-    hash = "sha256-xz1vP58hElXe/jLVrJOSpXcbqShBV7LHRpzqPLa2fDU=";
+    hash = "sha256-HF4Is3ak2nYD2Fq6HGHwyM5OTBVqYqbB22otOprzfiQ=";
   };
 
-  patches = [
-    # Patch from https://github.com/FreeRDP/FreeRDP/pull/11439
-    # To be removed at the next release
-    (fetchpatch2 {
-      url = "https://github.com/FreeRDP/FreeRDP/commit/67fabc34dce7aa3543e152f78cb4ea88ac9d1244.patch";
-      hash = "sha256-kYCEjH1kXZJbg2sN6YNhh+y19HTTCaC7neof8DTKZ/8=";
-    })
-  ];
-
   postPatch =
     ''
       # skip NIB file generation on darwin

From 76329597f0b4dd2d2a06e45ca2b08d3d1756b0e9 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 22 Jun 2025 21:59:09 +0800
Subject: [PATCH 17/59] cinnamon-session: Remove unused dbus-glib

* dbus-glib gone in https://github.com/linuxmint/cinnamon-session/commit/2d49e8ea97a00b1d8c4501376de07ce2bb2239f8.
* elogind is already optional: there is "elogind = dependency('', required: false)" when it is not available.
* glib is listed twice in buildInputs.
---
 ...001-Use-dbus_glib-instead-of-elogind.patch | 38 -------------------
 pkgs/by-name/ci/cinnamon-session/package.nix  |  7 ----
 2 files changed, 45 deletions(-)
 delete mode 100644 pkgs/by-name/ci/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch

diff --git a/pkgs/by-name/ci/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch b/pkgs/by-name/ci/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch
deleted file mode 100644
index 368e49bb84aa..000000000000
--- a/pkgs/by-name/ci/cinnamon-session/0001-Use-dbus_glib-instead-of-elogind.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From eb4a1eae754f222b1be902c2f050704fb0511cf7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
-Date: Sat, 5 Sep 2020 23:19:23 +0200
-Subject: [PATCH] Use dbus_glib instead of elogind
-
----
- cinnamon-session/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build
-index d8428dc..1f15115 100644
---- a/cinnamon-session/meson.build
-+++ b/cinnamon-session/meson.build
-@@ -56,6 +56,7 @@ cinnamon_session_sources = [
-   gdbus_sources,
- ]
- 
-+dbus_glib = dependency('dbus-glib-1')
- executable('cinnamon-session-binary',
-   cinnamon_session_sources,
-   dependencies: [
-@@ -74,7 +75,7 @@ executable('cinnamon-session-binary',
-     xext,
-     xrender,
-     xtest,
--    elogind,
-+    dbus_glib,
-   ],
-   link_with: [
-     libegg,
-@@ -98,4 +99,3 @@ foreach unit: units
-     dependencies: unit[2]
-   )
- endforeach
--
--- 
-2.28.0
-
diff --git a/pkgs/by-name/ci/cinnamon-session/package.nix b/pkgs/by-name/ci/cinnamon-session/package.nix
index d332997cfcf1..b9b27f88c3c4 100644
--- a/pkgs/by-name/ci/cinnamon-session/package.nix
+++ b/pkgs/by-name/ci/cinnamon-session/package.nix
@@ -3,7 +3,6 @@
   cinnamon-desktop,
   cinnamon-settings-daemon,
   cinnamon-translations,
-  dbus-glib,
   glib,
   gsettings-desktop-schemas,
   gtk3,
@@ -43,10 +42,6 @@ stdenv.mkDerivation rec {
     hash = "sha256-4uTKcmwfEytoAy4CFiOedYJqmPtBFBHk0P1gEGgm6pU=";
   };
 
-  patches = [
-    ./0001-Use-dbus_glib-instead-of-elogind.patch
-  ];
-
   buildInputs = [
     # meson.build
     cinnamon-desktop
@@ -68,8 +63,6 @@ stdenv.mkDerivation rec {
 
     # other (not meson.build)
     cinnamon-settings-daemon
-    dbus-glib
-    glib
     gsettings-desktop-schemas
     pythonEnv # for cinnamon-session-quit
   ];

From 1519c5d166803269f5bb672fdd754e6de939a544 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 22 Jun 2025 22:46:51 +0800
Subject: [PATCH 18/59] gxml: Disable tests

No upstream fix for months and this is only used by planify.
---
 pkgs/by-name/gx/gxml/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gx/gxml/package.nix b/pkgs/by-name/gx/gxml/package.nix
index 1ec14d461e72..f28c16d9ff6a 100644
--- a/pkgs/by-name/gx/gxml/package.nix
+++ b/pkgs/by-name/gx/gxml/package.nix
@@ -54,7 +54,8 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail ">=0" ">= 0"
   '';
 
-  doCheck = true;
+  # https://github.com/NixOS/nixpkgs/issues/407969
+  doCheck = false;
 
   passthru.updateScript = gitUpdater { };
 

From 28215026fcd44b942f38ac5876e3fcda4f4daed1 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 22 Jun 2025 22:49:46 +0800
Subject: [PATCH 19/59] planify: 4.12.0 -> 4.12.2

https://github.com/alainm23/planify/compare/4.12.0...4.12.2
---
 pkgs/by-name/pl/planify/package.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/pl/planify/package.nix b/pkgs/by-name/pl/planify/package.nix
index f58c3c9d2f4b..949044555868 100644
--- a/pkgs/by-name/pl/planify/package.nix
+++ b/pkgs/by-name/pl/planify/package.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation rec {
   pname = "planify";
-  version = "4.12.0";
+  version = "4.12.2";
 
   src = fetchFromGitHub {
     owner = "alainm23";
     repo = "planify";
     rev = version;
-    hash = "sha256-YgNM+fzss1+Q6Fv9mhedhCorWFnerx5oC3iISEhs6z8=";
+    hash = "sha256-v5Fwbl02t178t+l+VZybeUojIsblLX3Ws5itAAoEZwI=";
   };
 
   nativeBuildInputs = [
@@ -69,10 +69,6 @@ stdenv.mkDerivation rec {
     webkitgtk_6_0
   ];
 
-  mesonFlags = [
-    "-Dprofile=default"
-  ];
-
   meta = with lib; {
     description = "Task manager with Todoist support designed for GNU/Linux";
     homepage = "https://github.com/alainm23/planify";

From 73d3e75571990bb19b584148f16deef5c07fee7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 22 Jun 2025 11:27:20 -0700
Subject: [PATCH 20/59] python3Packages.requests-unixsocket2: 0.4.2 -> 1.0.0

Diff: https://gitlab.com/thelabnyc/requests-unixsocket2/-/compare/refs/tags/v0.4.2...v1.0.0

Changelog: https://gitlab.com/thelabnyc/requests-unixsocket2/-/blob/v1.0.0/CHANGELOG.md
---
 .../requests-unixsocket2/default.nix          | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/requests-unixsocket2/default.nix b/pkgs/development/python-modules/requests-unixsocket2/default.nix
index 83de0579a020..de974d9af6c4 100644
--- a/pkgs/development/python-modules/requests-unixsocket2/default.nix
+++ b/pkgs/development/python-modules/requests-unixsocket2/default.nix
@@ -1,33 +1,31 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-
-  pbr,
-
+  fetchFromGitLab,
   requests,
   poetry-core,
-
   pytestCheckHook,
+  urllib3,
   waitress,
 }:
 
 buildPythonPackage rec {
   pname = "requests-unixsocket2";
-  version = "0.4.2";
+  version = "1.0.0";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit version;
-    pname = "requests_unixsocket2";
-    hash = "sha256-kpxY7MWYHz0SdmHOueyMduDwjTHFLkSrFGKsDc1VtfU=";
+  src = fetchFromGitLab {
+    owner = "thelabnyc";
+    repo = "requests-unixsocket2";
+    tag = "v${version}";
+    hash = "sha256-HD68YczUy7bexm3Rrh0OfgOux3ItSYQB9lj68p7WtnU=";
   };
 
-  nativeBuildInputs = [ pbr ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     requests
-    poetry-core
+    urllib3
   ];
 
   nativeCheckInputs = [
@@ -37,10 +35,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "requests_unixsocket" ];
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://gitlab.com/thelabnyc/requests-unixsocket2/-/blob/${src.tag}/CHANGELOG.md";
     description = "Use requests to talk HTTP via a UNIX domain socket";
     homepage = "https://gitlab.com/thelabnyc/requests-unixsocket2";
-    license = licenses.bsd0;
-    maintainers = with maintainers; [ mikut ];
+    license = lib.licenses.bsd0;
+    maintainers = with lib.maintainers; [ mikut ];
   };
 }

From 5282c060a1eb8fbf521c69452a72080f63fc5498 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 22 Jun 2025 18:41:08 +0000
Subject: [PATCH 21/59] vopono: 0.10.12 -> 0.10.13

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

diff --git a/pkgs/by-name/vo/vopono/package.nix b/pkgs/by-name/vo/vopono/package.nix
index f40fae3d24b1..49c36832bec5 100644
--- a/pkgs/by-name/vo/vopono/package.nix
+++ b/pkgs/by-name/vo/vopono/package.nix
@@ -6,15 +6,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "vopono";
-  version = "0.10.12";
+  version = "0.10.13";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-bn3I5Yx9Kzj9ZQWn0fQUeDa6qjFAhWM38wJ/Oz3Q72k=";
+    hash = "sha256-xcxOdQyTNpC8Jhy8sE4AZPoFYTd/1gGdwMjc2W4S8Jc=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-vtZeL8XjsdzJcuHAVZKoI4GpcqHaOucX9qkjToIVqfQ=";
+  cargoHash = "sha256-ZDnSI30pVyvBcVe8Yeug42LxPcdVK1axeBWcpaaXYJQ=";
 
   meta = with lib; {
     description = "Run applications through VPN connections in network namespaces";

From ed67750e822cae357e1b78a994263d6ab79fdb4e Mon Sep 17 00:00:00 2001
From: Patrizio Bekerle <patrizio@bekerle.com>
Date: Sun, 22 Jun 2025 22:10:05 +0200
Subject: [PATCH 22/59] qownnotes: 25.6.2 -> 25.6.4

Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>
---
 pkgs/by-name/qo/qownnotes/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix
index 7dcb89a1b1f4..b3e562bce243 100644
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -6,6 +6,7 @@
   cmake,
   makeWrapper,
   botan3,
+  libgit2,
   pkg-config,
   nixosTests,
   installShellFiles,
@@ -17,11 +18,11 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "qownnotes";
   appname = "QOwnNotes";
-  version = "25.6.2";
+  version = "25.6.4";
 
   src = fetchurl {
     url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
-    hash = "sha256-JzUAZe0ktpn2ri2pO5780kOCLjCpRMzswOK4FaJAXe0=";
+    hash = "sha256-CL/jrWdyBpE27MuyjMaSO7ofzrCihXie15xbuWVjS28=";
   };
 
   nativeBuildInputs =
@@ -41,11 +42,13 @@ stdenv.mkDerivation (finalAttrs: {
     qt6Packages.qtsvg
     qt6Packages.qtwebsockets
     botan3
+    libgit2
   ] ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6Packages.qtwayland ];
 
   cmakeFlags = [
     "-DQON_QT6_BUILD=ON"
     "-DBUILD_WITH_SYSTEM_BOTAN=ON"
+    "-DBUILD_WITH_LIBGIT2=ON"
   ];
 
   # Install shell completion on Linux (with xvfb-run)

From 7c6d0a4c69d0b3ba9612ea50ceafd626907f611e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Jun 2025 00:47:33 +0000
Subject: [PATCH 23/59] microfetch: 0.4.8 -> 0.4.9

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

diff --git a/pkgs/by-name/mi/microfetch/package.nix b/pkgs/by-name/mi/microfetch/package.nix
index e25ffe66ab86..0be6283c82f4 100644
--- a/pkgs/by-name/mi/microfetch/package.nix
+++ b/pkgs/by-name/mi/microfetch/package.nix
@@ -7,17 +7,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "microfetch";
-  version = "0.4.8";
+  version = "0.4.9";
 
   src = fetchFromGitHub {
     owner = "NotAShelf";
     repo = "microfetch";
     tag = "v${version}";
-    hash = "sha256-WGr2qqxcbh7hotqPj8ZQbSB3E4qG5U2LEmqXx/aEc18=";
+    hash = "sha256-F3yRJrOzBzSDLadVTZqOPMaqF+3NSzedi222EawqVWQ=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-/siuEdZeIk23aIagbjrd5cYvb5/xEdAq84PoSVLWz60=";
+  cargoHash = "sha256-Ewtge3yaegzZM4DgUXSquyJM7xcpmSp6lLmMrfrgy4Y=";
 
   passthru.updateScript = nix-update-script { };
 

From a28f530ca451d7cac1b6b87c20ef5b6a9c5add68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Jun 2025 02:18:16 +0000
Subject: [PATCH 24/59] vscode-extensions.tabnine.tabnine-vscode: 3.288.0 ->
 3.291.0

---
 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 49a10e854436..b26f10108973 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4698,8 +4698,8 @@ let
         mktplcRef = {
           name = "tabnine-vscode";
           publisher = "tabnine";
-          version = "3.288.0";
-          hash = "sha256-2wq7ohOIAzF2EXeSkg2ADRLMvksaIeYBDJfSbPwX9vk=";
+          version = "3.291.0";
+          hash = "sha256-OuLjM/b1quixFRJePmbyHK9UqvtLGjc88rs0OnH67nU=";
         };
         meta = {
           license = lib.licenses.mit;

From 39f1dfddb0fa1b10b481a902055bc484910cdcbc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Jun 2025 06:41:01 +0000
Subject: [PATCH 25/59] redu: 0.2.13 -> 0.2.14

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

diff --git a/pkgs/by-name/re/redu/package.nix b/pkgs/by-name/re/redu/package.nix
index e81994bb9604..fc117ebaa136 100644
--- a/pkgs/by-name/re/redu/package.nix
+++ b/pkgs/by-name/re/redu/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "redu";
-  version = "0.2.13";
+  version = "0.2.14";
 
   src = fetchFromGitHub {
     owner = "drdo";
     repo = "redu";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iea3tt1WB0/5XPNeCAk38/UoCHVSngXfNmfZQyspmsw=";
+    hash = "sha256-E5itus0l1eENVWaSXUQHumxfo0ZMfSsguJuVSw0Uauk=";
   };
 
-  cargoHash = "sha256-fiMZIFIVeFnBnRBgmdUB8E5A2pM5nrTfUgD1LS6a4LQ=";
+  cargoHash = "sha256-ZUA9zmWzPvyFmqQFW3ShnQRqG3TODN7K8Ex1jrOZxd0=";
 
   env.RUSTC_BOOTSTRAP = 1;
 

From 2c4021e516141fb8f3d3332be282a0ab7a2348b0 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 23 Jun 2025 14:42:46 +0800
Subject: [PATCH 26/59] masterpdfeditor: add update script

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

diff --git a/pkgs/by-name/ma/masterpdfeditor/package.nix b/pkgs/by-name/ma/masterpdfeditor/package.nix
index 878352ee473c..abb6f029c140 100644
--- a/pkgs/by-name/ma/masterpdfeditor/package.nix
+++ b/pkgs/by-name/ma/masterpdfeditor/package.nix
@@ -7,6 +7,9 @@
   lib,
   libsForQt5,
   pkcs11helper,
+  common-updater-scripts,
+  nix-update,
+  writeShellScript,
 }:
 
 stdenv.mkDerivation rec {
@@ -69,6 +72,12 @@ stdenv.mkDerivation rec {
     patchelf $out/opt/masterpdfeditor/masterpdfeditor5 --add-needed libsmime3.so
   '';
 
+  passthru.updateScript = writeShellScript "update-masterpdfeditor" ''
+    latestVersion=$(curl -s https://code-industry.net/downloads/ | grep -A1 "fa-linux" | grep -oP 'Version\s+\K[\d.]+' | head -n 1)
+    ${lib.getExe nix-update} masterpdfeditor --version $latestVersion --system x86_64-linux
+    ${lib.getExe' common-updater-scripts "update-source-version"} masterpdfeditor $latestVersion --system=aarch64-linux --ignore-same-version
+  '';
+
   meta = {
     description = "Master PDF Editor";
     homepage = "https://code-industry.net/free-pdf-editor/";

From 97bc085262be512b317d47107b2f7ae917246212 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 23 Jun 2025 14:43:34 +0800
Subject: [PATCH 27/59] masterpdfeditor: use finalAttrs

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

diff --git a/pkgs/by-name/ma/masterpdfeditor/package.nix b/pkgs/by-name/ma/masterpdfeditor/package.nix
index abb6f029c140..228c4102ea24 100644
--- a/pkgs/by-name/ma/masterpdfeditor/package.nix
+++ b/pkgs/by-name/ma/masterpdfeditor/package.nix
@@ -12,7 +12,7 @@
   writeShellScript,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "masterpdfeditor";
   version = "5.9.86";
 
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
     in
     fetchurl {
       url = selectSystem {
-        x86_64-linux = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64-qt_include.tar.gz";
-        aarch64-linux = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.arm64.tar.gz";
+        x86_64-linux = "https://code-industry.net/public/master-pdf-editor-${finalAttrs.version}-qt5.x86_64-qt_include.tar.gz";
+        aarch64-linux = "https://code-industry.net/public/master-pdf-editor-${finalAttrs.version}-qt5.arm64.tar.gz";
       };
       hash = selectSystem {
         x86_64-linux = "sha256-QBwcsEz13+EdgkKJRdmdsb6f3dt3N6WR/EEACdWbYNo=";
@@ -90,4 +90,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ cmcdragonkai ];
     mainProgram = "masterpdfeditor5";
   };
-}
+})

From 1be40ea394f5efba7774638a4df6f1ace50b251a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 23 Jun 2025 09:22:55 +0200
Subject: [PATCH 28/59] csharp-ls: 0.17.0 -> 0.18.0

Diff:
https://github.com/razzmatazz/csharp-language-server/compare/0.17.0...0.18.0

Changelog:
https://github.com/razzmatazz/csharp-language-server/releases/tag/0.18.0
---
 pkgs/by-name/cs/csharp-ls/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cs/csharp-ls/package.nix b/pkgs/by-name/cs/csharp-ls/package.nix
index aed55650a4d2..4167fc1516e7 100644
--- a/pkgs/by-name/cs/csharp-ls/package.nix
+++ b/pkgs/by-name/cs/csharp-ls/package.nix
@@ -11,9 +11,9 @@ in
 
 buildDotnetGlobalTool rec {
   pname = "csharp-ls";
-  version = "0.17.0";
+  version = "0.18.0";
 
-  nugetHash = "sha256-8dPBDhLc+L/njlRE4UPqhWRV2k+jjgRri4rLW0dIHzM=";
+  nugetHash = "sha256-VSlyAt5c03Oiha21ZyQ4Xm/2iIse0h1eVrVpu+nWW3s=";
 
   inherit dotnet-sdk;
   dotnet-runtime = dotnet-sdk;

From 26d86dfe0bcdcc5d61c5fbd29d1e92cba716a58d Mon Sep 17 00:00:00 2001
From: Stephen Huan <stephen.huan@cgdct.moe>
Date: Mon, 23 Jun 2025 06:17:04 -0400
Subject: [PATCH 29/59] python3Packages.etils: adjust dependencies

---
 .../python-modules/etils/default.nix          | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix
index c192f670940f..0718b0abb60d 100644
--- a/pkgs/development/python-modules/etils/default.nix
+++ b/pkgs/development/python-modules/etils/default.nix
@@ -17,10 +17,17 @@
   jupyter,
   mediapy,
   numpy,
+  packaging,
+  protobuf,
+  fsspec,
   importlib-resources,
   typing-extensions,
   zipp,
   absl-py,
+  simple-parsing,
+  einops,
+  gcsfs,
+  s3fs,
   tqdm,
   dm-tree,
   jax,
@@ -44,23 +51,33 @@ buildPythonPackage rec {
   optional-dependencies = rec {
     array-types = enp;
     eapp = [
-      absl-py # FIXME package simple-parsing
+      absl-py
+      simple-parsing
     ] ++ epy;
     ecolab =
       [
         jupyter
         numpy
         mediapy
+        packaging
+        protobuf
       ]
       ++ enp
-      ++ epy;
+      ++ epy
+      ++ etree;
     edc = epy;
-    enp = [ numpy ] ++ epy;
+    enp = [
+      numpy
+      einops
+    ] ++ epy;
     epath = [
+      fsspec
       importlib-resources
       typing-extensions
       zipp
     ] ++ epy;
+    epath-gcs = [ gcsfs ] ++ epath;
+    epath-s3 = [ s3fs ] ++ epath;
     epy = [ typing-extensions ];
     etqdm = [
       absl-py
@@ -70,6 +87,7 @@ buildPythonPackage rec {
     etree-dm = [ dm-tree ] ++ etree;
     etree-jax = [ jax ] ++ etree;
     etree-tf = [ tensorflow ] ++ etree;
+    lazy-imports = ecolab;
     all =
       array-types
       ++ eapp
@@ -77,6 +95,8 @@ buildPythonPackage rec {
       ++ edc
       ++ enp
       ++ epath
+      ++ epath-gcs
+      ++ epath-s3
       ++ epy
       ++ etqdm
       ++ etree

From 418cefae105c274fc7e96571f244b185a9f37ae2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Jun 2025 10:50:32 +0000
Subject: [PATCH 30/59] python3Packages.guidata: 3.9.0 -> 3.10.0

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

diff --git a/pkgs/development/python-modules/guidata/default.nix b/pkgs/development/python-modules/guidata/default.nix
index 4ec4ac679810..2958233dd986 100644
--- a/pkgs/development/python-modules/guidata/default.nix
+++ b/pkgs/development/python-modules/guidata/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "guidata";
-  version = "3.9.0";
+  version = "3.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PlotPyStack";
     repo = "guidata";
     tag = "v${version}";
-    hash = "sha256-W3d7LGfQJ9DVngZxhnuQpoTHvXyHenaXzm7qeqi/zGQ=";
+    hash = "sha256-jVRUnP+0mPA79K23VI8/BXaCGvR2DUfyd+cXA8On34Y=";
   };
 
   build-system = [

From f661909067d8b60416801a99cbb7116aa5d059ee Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sun, 22 Jun 2025 18:53:18 -0700
Subject: [PATCH 31/59] llvmPackages_git: 21.0.0-unstable-2025-06-15 ->
 21.0.0-unstable-2025-06-22

---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index 2ae34f202fd1..41500bcba153 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -33,9 +33,9 @@ let
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.6".officialRelease.sha256 = "sha256-PfCzECiCM+k0hHqEUSr1TSpnII5nqIxg+Z8ICjmMj0Y=";
     "21.0.0-git".gitRelease = {
-      rev = "9adde28df784f5c0cc960bdabd413ac131a5852e";
-      rev-version = "21.0.0-unstable-2025-06-15";
-      sha256 = "sha256-8HrUSKL3vOd/Jg9svso9ChCr4tvlGOliyGfi18oZLDY=";
+      rev = "f9fce4975bbad835deba6e639c21a62154dd8c14";
+      rev-version = "21.0.0-unstable-2025-06-22";
+      sha256 = "sha256-Xu9RD6R6tQDZ0kaSD7N0GTp1TcUV6BK12fobK0qPkIw=";
     };
   } // llvmVersions;
 

From dbe30c8bc11755edd55f179beb15f0f64f829a92 Mon Sep 17 00:00:00 2001
From: Charlotte Hartmann Paludo <git@charlotteharludo.com>
Date: Mon, 23 Jun 2025 13:38:01 +0200
Subject: [PATCH 32/59] protoc-gen-go-ttrpc: init at 1.2.7

---
 .../pr/protoc-gen-go-ttrpc/package.nix        | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 pkgs/by-name/pr/protoc-gen-go-ttrpc/package.nix

diff --git a/pkgs/by-name/pr/protoc-gen-go-ttrpc/package.nix b/pkgs/by-name/pr/protoc-gen-go-ttrpc/package.nix
new file mode 100644
index 000000000000..265a85b4ee82
--- /dev/null
+++ b/pkgs/by-name/pr/protoc-gen-go-ttrpc/package.nix
@@ -0,0 +1,42 @@
+{
+  buildGoModule,
+  fetchFromGitHub,
+  lib,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "protoc-gen-go-ttrpc";
+  version = "1.2.7";
+
+  src = fetchFromGitHub {
+    owner = "containerd";
+    repo = "ttrpc";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-oQamR59cQrcuw9tervKrf+2vYnweRRNgST8GObFNjTk=";
+  };
+
+  proxyVendor = true;
+  vendorHash = "sha256-ecEO3ZM4RWl6fXvCkncetjgUZB4+LBzSFVTgiYO3tOU=";
+
+  subPackages = [
+    "cmd/protoc-gen-go-ttrpc"
+    "cmd/protoc-gen-gogottrpc"
+  ];
+
+  env.CGO_ENABLED = 0;
+  ldflags = [
+    "-s"
+  ];
+
+  meta = {
+    description = "GRPC for low-memory environments";
+    homepage = "https://github.com/containerd/ttrpc";
+    changelog = "https://github.com/containerd/ttrpc/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      charludo
+      katexochen
+    ];
+    mainProgram = "protoc-gen-go-ttrpc";
+  };
+})

From 63f6b134e4e93f6f6b1449751daa41379fb264ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Jun 2025 12:40:07 +0000
Subject: [PATCH 33/59] vscode-extensions.github.vscode-pull-request-github:
 0.110.0 -> 0.112.0

---
 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 3284df0dc3c3..60b75f5d7add 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2119,8 +2119,8 @@ let
         mktplcRef = {
           publisher = "github";
           name = "vscode-pull-request-github";
-          version = "0.110.0";
-          hash = "sha256-roD6ugBm04L2IOKIQiAWULhhq4wo1O9VMYiYtdwCrCc=";
+          version = "0.112.0";
+          hash = "sha256-L1xXgjhYmBEO+M7wZ7vkM5ktOflB9xrouAcWx9KKKT4=";
         };
         meta = {
           license = lib.licenses.mit;

From ec161f42ce57934aed3c8001b97dae766abe8373 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Jun 2025 12:45:32 +0000
Subject: [PATCH 34/59] parallel: 20250522 -> 20250622

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

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index f0a36d17aa58..679e1c764f5c 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   pname = "parallel";
-  version = "20250522";
+  version = "20250622";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/parallel-${version}.tar.bz2";
-    hash = "sha256-tLKPR1+M/4u27UsDzFpnBB8Y/HP6JWkjsjGBtWr9sss=";
+    hash = "sha256-afV4zxHxsSS6PCtnOhZkHevmOus9KsTOxa1l+KU9SJs=";
   };
 
   outputs = [

From ed9da5a6ac8d1b6a98ae8913494e8db6ebd1132b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Jun 2025 12:51:31 +0000
Subject: [PATCH 35/59] typos-lsp: 0.1.38 -> 0.1.39

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

diff --git a/pkgs/by-name/ty/typos-lsp/package.nix b/pkgs/by-name/ty/typos-lsp/package.nix
index 013cbbb5d5e7..646c23355da0 100644
--- a/pkgs/by-name/ty/typos-lsp/package.nix
+++ b/pkgs/by-name/ty/typos-lsp/package.nix
@@ -7,17 +7,17 @@ rustPlatform.buildRustPackage rec {
   pname = "typos-lsp";
   # Please update the corresponding VSCode extension too.
   # See pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix
-  version = "0.1.38";
+  version = "0.1.39";
 
   src = fetchFromGitHub {
     owner = "tekumara";
     repo = "typos-lsp";
     tag = "v${version}";
-    hash = "sha256-WzQh+XGROekMzjnR292REI0S1hhaxSHYNWbtwPHy/tA=";
+    hash = "sha256-GMU7xWVwHleBbtCVjKWzpOvAl8JcObX/phpTphP7N5I=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-TDcf8AyvpgpVUC5Pw2y+N6ZBhnimrpt39appwZAE8T0=";
+  cargoHash = "sha256-7BN+K14M4dzKP89ATA/zK1QfJxnEFD1j7kwBvvWrHQw=";
 
   # fix for compilation on aarch64
   # see https://github.com/NixOS/nixpkgs/issues/145726

From fd3d596a1c55593529681dd3037f25c2a726c3b8 Mon Sep 17 00:00:00 2001
From: Greizgh <greizgh@ephax.org>
Date: Mon, 23 Jun 2025 14:52:43 +0200
Subject: [PATCH 36/59] seafile: remove myself from maintainers

I do not use seafile anymore and won't spend energy working on it.
---
 nixos/modules/services/networking/seafile.nix                 | 1 -
 pkgs/applications/networking/seafile-client/default.nix       | 1 -
 pkgs/by-name/li/libsearpc/package.nix                         | 2 +-
 pkgs/by-name/se/seafile-server/libevhtp.nix                   | 1 -
 pkgs/by-name/se/seafile-server/package.nix                    | 1 -
 pkgs/by-name/se/seafile-shared/package.nix                    | 1 -
 pkgs/by-name/se/seahub/package.nix                            | 1 -
 pkgs/development/python-modules/django-formtools/default.nix  | 1 -
 pkgs/development/python-modules/django-statici18n/default.nix | 1 -
 9 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/nixos/modules/services/networking/seafile.nix b/nixos/modules/services/networking/seafile.nix
index 8ae361b4d8be..2129af18ed76 100644
--- a/nixos/modules/services/networking/seafile.nix
+++ b/nixos/modules/services/networking/seafile.nix
@@ -542,7 +542,6 @@ in
   };
 
   meta.maintainers = with lib.maintainers; [
-    greizgh
     schmittlauch
   ];
 }
diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 94495361d60c..7b3ae093fcc1 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -52,7 +52,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = with maintainers; [
       schmittlauch
-      greizgh
     ];
     mainProgram = "seafile-applet";
   };
diff --git a/pkgs/by-name/li/libsearpc/package.nix b/pkgs/by-name/li/libsearpc/package.nix
index 219c5221ca02..726aa9ac467b 100644
--- a/pkgs/by-name/li/libsearpc/package.nix
+++ b/pkgs/by-name/li/libsearpc/package.nix
@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
     mainProgram = "searpc-codegen.py";
     license = lib.licenses.lgpl3;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ greizgh ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/se/seafile-server/libevhtp.nix b/pkgs/by-name/se/seafile-server/libevhtp.nix
index 9428ceac86ed..07f0df1cd8f6 100644
--- a/pkgs/by-name/se/seafile-server/libevhtp.nix
+++ b/pkgs/by-name/se/seafile-server/libevhtp.nix
@@ -31,7 +31,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/criticalstack/libevhtp";
     license = licenses.bsd3;
     maintainers = with maintainers; [
-      greizgh
       schmittlauch
       melvyn2
     ];
diff --git a/pkgs/by-name/se/seafile-server/package.nix b/pkgs/by-name/se/seafile-server/package.nix
index 864eedd69663..35f2ca2378d0 100644
--- a/pkgs/by-name/se/seafile-server/package.nix
+++ b/pkgs/by-name/se/seafile-server/package.nix
@@ -94,7 +94,6 @@ stdenv.mkDerivation {
     license = licenses.agpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [
-      greizgh
       schmittlauch
       melvyn2
     ];
diff --git a/pkgs/by-name/se/seafile-shared/package.nix b/pkgs/by-name/se/seafile-shared/package.nix
index 4e9f5c40d3f3..2fb2891eecd5 100644
--- a/pkgs/by-name/se/seafile-shared/package.nix
+++ b/pkgs/by-name/se/seafile-shared/package.nix
@@ -62,7 +62,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [
-      greizgh
       schmittlauch
     ];
   };
diff --git a/pkgs/by-name/se/seahub/package.nix b/pkgs/by-name/se/seahub/package.nix
index b1df123cd814..7b409165da1c 100644
--- a/pkgs/by-name/se/seahub/package.nix
+++ b/pkgs/by-name/se/seahub/package.nix
@@ -79,7 +79,6 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/haiwen/seahub";
     license = licenses.asl20;
     maintainers = with maintainers; [
-      greizgh
       schmittlauch
       melvyn2
     ];
diff --git a/pkgs/development/python-modules/django-formtools/default.nix b/pkgs/development/python-modules/django-formtools/default.nix
index 0bd2d30e3413..5f74ef1802cb 100644
--- a/pkgs/development/python-modules/django-formtools/default.nix
+++ b/pkgs/development/python-modules/django-formtools/default.nix
@@ -40,7 +40,6 @@ buildPythonPackage rec {
     changelog = "https://github.com/jazzband/django-formtools/blob/master/docs/changelog.rst";
     license = licenses.bsd3;
     maintainers = with maintainers; [
-      greizgh
       schmittlauch
     ];
   };
diff --git a/pkgs/development/python-modules/django-statici18n/default.nix b/pkgs/development/python-modules/django-statici18n/default.nix
index e48234004cc6..d7b2e85fe2a3 100644
--- a/pkgs/development/python-modules/django-statici18n/default.nix
+++ b/pkgs/development/python-modules/django-statici18n/default.nix
@@ -48,7 +48,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/zyegfryed/django-statici18n";
     license = licenses.bsd3;
     maintainers = with maintainers; [
-      greizgh
       schmittlauch
     ];
   };

From c7a857230bd24947fdf835e397bb43e48729bf83 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Jun 2025 13:09:34 +0000
Subject: [PATCH 37/59] scaleway-cli: 2.40.0 -> 2.41.0

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

diff --git a/pkgs/by-name/sc/scaleway-cli/package.nix b/pkgs/by-name/sc/scaleway-cli/package.nix
index 307b9b92fa6a..1fd80d3f738e 100644
--- a/pkgs/by-name/sc/scaleway-cli/package.nix
+++ b/pkgs/by-name/sc/scaleway-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "scaleway-cli";
-  version = "2.40.0";
+  version = "2.41.0";
 
   src = fetchFromGitHub {
     owner = "scaleway";
     repo = "scaleway-cli";
     rev = "v${version}";
-    sha256 = "sha256-nYJKWei9ObQTN1bMrkdSG/++1E3Y70L88+noyrFbKQ4=";
+    sha256 = "sha256-DB+x2V1KrZzv6qingL2z/dcFtaFKEeOs8JMwWWIIQkk=";
   };
 
-  vendorHash = "sha256-FQgUyVCBUSJnFxnYO7I4ibz6KS6M2TUUaL+uNtNW6Pg=";
+  vendorHash = "sha256-CYRQxs/Jj/tXoUWx+O/NFeGyNyi2mmLphHvhxZdBFnw=";
 
   ldflags = [
     "-w"

From 6418fbd1e508775e987138ab1b3553cc421c61ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Jun 2025 13:17:36 +0000
Subject: [PATCH 38/59] artichoke: 0-unstable-2025-06-01 ->
 0-unstable-2025-06-18

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

diff --git a/pkgs/by-name/ar/artichoke/package.nix b/pkgs/by-name/ar/artichoke/package.nix
index f3d93d31a96a..55593a0e617c 100644
--- a/pkgs/by-name/ar/artichoke/package.nix
+++ b/pkgs/by-name/ar/artichoke/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage {
   pname = "artichoke";
-  version = "0-unstable-2025-06-01";
+  version = "0-unstable-2025-06-18";
 
   src = fetchFromGitHub {
     owner = "artichoke";
     repo = "artichoke";
-    rev = "7c35392d8c7622cd8ab8eccaee73d57633b2b901";
-    hash = "sha256-7YPExT+5F+5MMk/yLfG4Rk8ZDwsYfVKlkvIroFB22No=";
+    rev = "94921a493f680381c83465e5c50e5d494a7048f6";
+    hash = "sha256-JdCGCvs7GK/I3yyIl4n9OGtN9VwzmwdDdglwbTHfx0Y=";
   };
 
-  cargoHash = "sha256-cN70yYYKhktUoswow63ZXHvfFbXDo1rUrTWm22LluCM=";
+  cargoHash = "sha256-a43awTdhOlu+KO3B6XQ7Vdv4NbZ3iffq4rpmBBgUcZ8=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook

From 305503a566df7e86e66a31b15a0168a99eee844b Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 23 Jun 2025 14:52:21 +0800
Subject: [PATCH 39/59] masterpdfeditor: refactor

desktop file use usr/share/applications/net.code-industry.masterpdfeditor5.desktop, this is more consistent on x86_64-linux and aarch64-linux
use $out/share/masterpdfeditor as app dir
---
 pkgs/by-name/ma/masterpdfeditor/package.nix | 42 ++++++++++-----------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/ma/masterpdfeditor/package.nix b/pkgs/by-name/ma/masterpdfeditor/package.nix
index 228c4102ea24..5c3b601b1e85 100644
--- a/pkgs/by-name/ma/masterpdfeditor/package.nix
+++ b/pkgs/by-name/ma/masterpdfeditor/package.nix
@@ -1,12 +1,12 @@
 {
+  lib,
   stdenv,
   fetchurl,
-  sane-backends,
-  nss,
   autoPatchelfHook,
-  lib,
   libsForQt5,
+  nss,
   pkcs11helper,
+  sane-backends,
   common-updater-scripts,
   nix-update,
   writeShellScript,
@@ -36,13 +36,13 @@ stdenv.mkDerivation (finalAttrs: {
     libsForQt5.wrapQtAppsHook
   ];
 
-  buildInputs = with libsForQt5; [
+  buildInputs = [
+    (lib.getLib stdenv.cc.cc)
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     nss
-    qtbase
-    qtsvg
-    sane-backends
-    stdenv.cc.cc
     pkcs11helper
+    sane-backends
   ];
 
   dontStrip = true;
@@ -50,26 +50,22 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    p=$out/opt/masterpdfeditor
-    mkdir -p $out/bin
-
-    substituteInPlace masterpdfeditor5.desktop \
-      --replace-fail 'Exec=/opt/master-pdf-editor-5' "Exec=$out/bin" \
-      --replace-fail 'Path=/opt/master-pdf-editor-5' "Path=$out/bin" \
-      --replace-fail 'Icon=/opt/master-pdf-editor-5' "Icon=$out/share/pixmaps"
-
-    install -Dm644 -t $out/share/pixmaps      masterpdfeditor5.png
-    install -Dm644 -t $out/share/applications masterpdfeditor5.desktop
-    install -Dm755 -t $p                      masterpdfeditor5
-    install -Dm644 license_en.txt $out/share/$name/LICENSE
-    ln -s $p/masterpdfeditor5 $out/bin/masterpdfeditor5
-    cp -v -r stamps templates lang fonts $p
+    substituteInPlace usr/share/applications/net.code-industry.masterpdfeditor5.desktop \
+      --replace-fail "Exec=/opt/master-pdf-editor-5/masterpdfeditor5" "Exec=masterpdfeditor5" \
+      --replace-fail "Path=/opt/master-pdf-editor-5" "Path=$out/share/masterpdfeditor" \
+      --replace-fail "/opt/master-pdf-editor-5/masterpdfeditor5.png" "masterpdfeditor5"
+    cp -r usr $out
+    install -Dm755 masterpdfeditor5 -t $out/share/masterpdfeditor
+    cp -r stamps templates lang fonts $out/share/masterpdfeditor
+    mkdir $out/bin
+    ln -s $out/share/masterpdfeditor/masterpdfeditor5 $out/bin/masterpdfeditor5
 
     runHook postInstall
   '';
 
   preFixup = ''
-    patchelf $out/opt/masterpdfeditor/masterpdfeditor5 --add-needed libsmime3.so
+    patchelf $out/share/masterpdfeditor/masterpdfeditor5 \
+      --add-needed libsmime3.so
   '';
 
   passthru.updateScript = writeShellScript "update-masterpdfeditor" ''

From e09e9cec67b3f05e34dad75a0dab68c876c61796 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Jun 2025 13:27:23 +0000
Subject: [PATCH 40/59] msolve: 0.8.0 -> 0.9.0

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

diff --git a/pkgs/by-name/ms/msolve/package.nix b/pkgs/by-name/ms/msolve/package.nix
index 037ce3270023..3de755ee2cc0 100644
--- a/pkgs/by-name/ms/msolve/package.nix
+++ b/pkgs/by-name/ms/msolve/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "msolve";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "algebraic-solving";
     repo = "msolve";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0kqRnBJA5CwsLY/YWZXu2+y4aiZAQQYl30Qb3JX3zEo=";
+    hash = "sha256-6TU/h6ewQreomjStHZRViYTrrDG3+MZXa8mLg1NvvZg=";
   };
 
   postPatch = ''

From bb418688f22d7c5081c03e2432e3701a1130dfb2 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Mon, 23 Jun 2025 14:53:06 +0800
Subject: [PATCH 41/59] masterpdfeditor: 5.9.86 -> 5.9.89

---
 pkgs/by-name/ma/masterpdfeditor/package.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/masterpdfeditor/package.nix b/pkgs/by-name/ma/masterpdfeditor/package.nix
index 5c3b601b1e85..d3c93e1f14f4 100644
--- a/pkgs/by-name/ma/masterpdfeditor/package.nix
+++ b/pkgs/by-name/ma/masterpdfeditor/package.nix
@@ -4,6 +4,9 @@
   fetchurl,
   autoPatchelfHook,
   libsForQt5,
+  cups,
+  libinput,
+  mtdev,
   nss,
   pkcs11helper,
   sane-backends,
@@ -14,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "masterpdfeditor";
-  version = "5.9.86";
+  version = "5.9.89";
 
   src =
     let
@@ -26,8 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
         aarch64-linux = "https://code-industry.net/public/master-pdf-editor-${finalAttrs.version}-qt5.arm64.tar.gz";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-QBwcsEz13+EdgkKJRdmdsb6f3dt3N6WR/EEACdWbYNo=";
-        aarch64-linux = "sha256-OTn5Z82fRMLQwVSLwoGAaj9c9SfEicyl8e1A1ICOUf0=";
+        x86_64-linux = "sha256-HTYFo3tZD1JiYpsx/q9mr1Sp9JIWA6Kp0ThzmDcvxmo=";
+        aarch64-linux = "sha256-uxCp9iv4923Qbyd2IldHm1/a50GU6VISSG6jfVzQqq4=";
       };
     };
 
@@ -38,8 +41,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     (lib.getLib stdenv.cc.cc)
+    cups
     libsForQt5.qtbase
     libsForQt5.qtsvg
+    libinput
+    mtdev
     nss
     pkcs11helper
     sane-backends

From 75d0c240aca1d3634c941fe42ac9a2ebae3cbd3c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Jun 2025 13:34:10 +0000
Subject: [PATCH 42/59] microsoft-edge: 137.0.3296.83 -> 137.0.3296.93

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

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 60b707caf99b..e41cc3f91326 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -179,11 +179,11 @@ in
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "137.0.3296.83";
+  version = "137.0.3296.93";
 
   src = fetchurl {
     url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
-    hash = "sha256-wbiijvxzyyM9lxoMtcQHFqZYChlsHh0hNQTwdgxPpZY=";
+    hash = "sha256-SC8h6UQ/ee5ZlQWAZsmC1Co5Ky4kaXuoMpvVZtTIMHQ=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From 842e50a0fb2385f104645bd4d26990d0c1a76a66 Mon Sep 17 00:00:00 2001
From: Timon Schelling <me@timon.zip>
Date: Mon, 23 Jun 2025 13:38:38 +0000
Subject: [PATCH 43/59] vscode-extensions.miguelsolorio.min-theme: init at
 1.5.0

---
 .../editors/vscode/extensions/default.nix        |  2 ++
 .../miguelsolorio.min-theme/default.nix          | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/applications/editors/vscode/extensions/miguelsolorio.min-theme/default.nix

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 2be6842a5a42..2de021709a7b 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3215,6 +3215,8 @@ let
         };
       };
 
+      miguelsolorio.min-theme = callPackage ./miguelsolorio.min-theme { };
+
       mikestead.dotenv = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "dotenv";
diff --git a/pkgs/applications/editors/vscode/extensions/miguelsolorio.min-theme/default.nix b/pkgs/applications/editors/vscode/extensions/miguelsolorio.min-theme/default.nix
new file mode 100644
index 000000000000..813d2cb552d1
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/miguelsolorio.min-theme/default.nix
@@ -0,0 +1,16 @@
+{ lib, vscode-utils }:
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "min-theme";
+    publisher = "miguelsolorio";
+    version = "1.5.0";
+    hash = "sha256-DF/9OlWmjmnZNRBs2hk0qEWN38RcgacdVl9e75N8ZMY=";
+  };
+  meta = {
+    description = "Minimal theme for VS Code that comes in dark and light";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=miguelsolorio.min-theme";
+    homepage = "https://github.com/miguelsolorio/min-theme";
+    license = lib.licenses.mit;
+  };
+}

From 3f2e885ebafe84b78f0be504c75ef33135601406 Mon Sep 17 00:00:00 2001
From: Timon Schelling <me@timon.zip>
Date: Mon, 23 Jun 2025 13:55:21 +0000
Subject: [PATCH 44/59] vscode-extensions.bierner.color-info: init at 0.7.2

---
 .../extensions/bierner.color-info/default.nix  | 18 ++++++++++++++++++
 .../editors/vscode/extensions/default.nix      |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/applications/editors/vscode/extensions/bierner.color-info/default.nix

diff --git a/pkgs/applications/editors/vscode/extensions/bierner.color-info/default.nix b/pkgs/applications/editors/vscode/extensions/bierner.color-info/default.nix
new file mode 100644
index 000000000000..03e8628db07a
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/bierner.color-info/default.nix
@@ -0,0 +1,18 @@
+{ lib, vscode-utils }:
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "color-info";
+    publisher = "bierner";
+    version = "0.7.2";
+    hash = "sha256-Bf0thdt4yxH7OsRhIXeqvaxD1tbHTrUc4QJcju7Hv90=";
+  };
+  meta = {
+    description = "VSCode Extension that provides additional information about css colors";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=bierner.color-info";
+    homepage = "https://github.com/mattbierner/vscode-color-info";
+    changelog = "https://marketplace.visualstudio.com/items/bierner.color-info/changelog";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.timon ];
+  };
+}
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 2be6842a5a42..2f72536b184d 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -580,6 +580,8 @@ let
         };
       };
 
+      bierner.color-info = callPackage ./bierner.color-info { };
+
       bierner.docs-view = buildVscodeMarketplaceExtension {
         mktplcRef = {
           name = "docs-view";

From 2d808017a795d48ce668acf68cb75b0d192c8df7 Mon Sep 17 00:00:00 2001
From: eiraniko <>
Date: Mon, 23 Jun 2025 22:03:52 +0800
Subject: [PATCH 45/59] vcsh: use finalAttrs

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

diff --git a/pkgs/by-name/vc/vcsh/package.nix b/pkgs/by-name/vc/vcsh/package.nix
index 69bde561ce61..1a55a4bb0580 100644
--- a/pkgs/by-name/vc/vcsh/package.nix
+++ b/pkgs/by-name/vc/vcsh/package.nix
@@ -8,12 +8,12 @@
   perlPackages,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "vcsh";
   version = "2.0.8";
 
   src = fetchurl {
-    url = "https://github.com/RichiH/vcsh/releases/download/v${version}/${pname}-${version}.tar.xz";
+    url = "https://github.com/RichiH/vcsh/releases/download/v${finalAttrs.version}/vcsh-${finalAttrs.version}.tar.xz";
     sha256 = "sha256-VgRA3v5PIKwizmXoc8f/YMoMCDGFJK/m2uhq3EsT1xQ=";
   };
 
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Version Control System for $HOME";
     homepage = "https://github.com/RichiH/vcsh";
-    changelog = "https://github.com/RichiH/vcsh/blob/v${version}/changelog";
+    changelog = "https://github.com/RichiH/vcsh/blob/v${finalAttrs.version}/changelog";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
       ttuegel
@@ -50,4 +50,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     mainProgram = "vcsh";
   };
-}
+})

From c249aba29ec883896c21821ebaef26123bc0ae23 Mon Sep 17 00:00:00 2001
From: eiraniko <>
Date: Mon, 23 Jun 2025 22:04:34 +0800
Subject: [PATCH 46/59] vcsh: 2.0.8 -> 2.0.10

Diff: RichiH/vcsh@v2.0.8...v2.0.10

Changelog: https://github.com/RichiH/vcsh/blob/v2.0.10/changelog
---
 pkgs/by-name/vc/vcsh/package.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/vc/vcsh/package.nix b/pkgs/by-name/vc/vcsh/package.nix
index 1a55a4bb0580..50d657e0235e 100644
--- a/pkgs/by-name/vc/vcsh/package.nix
+++ b/pkgs/by-name/vc/vcsh/package.nix
@@ -2,24 +2,30 @@
   lib,
   stdenv,
   fetchurl,
+  autoconf,
+  automake,
   makeWrapper,
   pkg-config,
+  unzip,
   git,
   perlPackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vcsh";
-  version = "2.0.8";
+  version = "2.0.10";
 
   src = fetchurl {
-    url = "https://github.com/RichiH/vcsh/releases/download/v${finalAttrs.version}/vcsh-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-VgRA3v5PIKwizmXoc8f/YMoMCDGFJK/m2uhq3EsT1xQ=";
+    url = "https://github.com/RichiH/vcsh/releases/download/v${finalAttrs.version}/vcsh-${finalAttrs.version}.zip";
+    hash = "sha256-M/UME2kNCxwzngKXMYp0cdps7LWVwoS2I/mTrvPts7g=";
   };
 
   nativeBuildInputs = [
-    pkg-config
+    autoconf
+    automake
     makeWrapper
+    pkg-config
+    unzip
   ];
 
   buildInputs = [ git ];

From 3c1b4354271e640af32f4760d24c9ce2b34bcaed Mon Sep 17 00:00:00 2001
From: Dan Xin <davinci42.cn@gmail.com>
Date: Mon, 23 Jun 2025 22:08:39 +0800
Subject: [PATCH 47/59] ffsubsync: update ffmpeg dependency handling and adjust
 wrapper arguments

---
 pkgs/by-name/ff/ffsubsync/package.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ff/ffsubsync/package.nix b/pkgs/by-name/ff/ffsubsync/package.nix
index 227181e043aa..b3940c53a01e 100644
--- a/pkgs/by-name/ff/ffsubsync/package.nix
+++ b/pkgs/by-name/ff/ffsubsync/package.nix
@@ -2,6 +2,7 @@
   lib,
   python3,
   fetchFromGitHub,
+  ffmpeg,
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -24,7 +25,6 @@ python3.pkgs.buildPythonApplication rec {
     faust-cchardet
     ffmpeg-python
     numpy
-    pkgs.ffmpeg
     pysubs2
     chardet
     rich
@@ -40,6 +40,13 @@ python3.pkgs.buildPythonApplication rec {
 
   pythonImportsCheck = [ "ffsubsync" ];
 
+  makeWrapperArgs = [
+    "--prefix"
+    "PATH"
+    ":"
+    "${ffmpeg}/bin"
+  ];
+
   meta = {
     homepage = "https://github.com/smacke/ffsubsync";
     description = "Automagically synchronize subtitles with video";

From ba4405a58dcfc6598e0cc20fb588ee882fd631d7 Mon Sep 17 00:00:00 2001
From: Stephen Huan <stephen.huan@cgdct.moe>
Date: Mon, 23 Jun 2025 10:43:25 -0400
Subject: [PATCH 48/59]  python312Packages.tensorflow-datasets: adjust
 dependencies  (#419210)

* python312Packages.tensorflow-datasets: adjust dependencies

* python312Packages.tensorflow-datasets: nixfmt
---
 .../tensorflow-datasets/default.nix           | 61 ++++++++++++-------
 1 file changed, 39 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix
index eb121d899ae0..f150bbd74e32 100644
--- a/pkgs/development/python-modules/tensorflow-datasets/default.nix
+++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix
@@ -3,23 +3,29 @@
   buildPythonPackage,
   fetchFromGitHub,
 
+  # build system
+  setuptools,
+
   # dependencies
+  absl-py,
   array-record,
-  dill,
   dm-tree,
-  future,
+  etils,
   immutabledict,
-  importlib-resources,
   numpy,
   promise,
   protobuf,
   psutil,
+  pyarrow,
   requests,
   simple-parsing,
-  six,
   tensorflow-metadata,
   termcolor,
+  toml,
   tqdm,
+  wrapt,
+  pythonOlder,
+  importlib-resources,
 
   # tests
   apache-beam,
@@ -27,6 +33,7 @@
   click,
   cloudpickle,
   datasets,
+  dill,
   ffmpeg,
   imagemagick,
   jax,
@@ -67,24 +74,33 @@ buildPythonPackage rec {
     hash = "sha256-ZXaPYmj8aozfe6ygzKybId8RZ1TqPuIOSpd8XxnRHus=";
   };
 
-  dependencies = [
-    array-record
-    dill
-    dm-tree
-    future
-    immutabledict
-    importlib-resources
-    numpy
-    promise
-    protobuf
-    psutil
-    requests
-    simple-parsing
-    six
-    tensorflow-metadata
-    termcolor
-    tqdm
-  ];
+  build-system = [ setuptools ];
+
+  dependencies =
+    [
+      absl-py
+      array-record
+      dm-tree
+      etils
+      immutabledict
+      numpy
+      promise
+      protobuf
+      psutil
+      pyarrow
+      requests
+      simple-parsing
+      tensorflow-metadata
+      termcolor
+      toml
+      tqdm
+      wrapt
+    ]
+    ++ etils.optional-dependencies.epath
+    ++ etils.optional-dependencies.etree
+    ++ lib.optionals (pythonOlder "3.9") [
+      importlib-resources
+    ];
 
   pythonImportsCheck = [ "tensorflow_datasets" ];
 
@@ -94,6 +110,7 @@ buildPythonPackage rec {
     click
     cloudpickle
     datasets
+    dill
     ffmpeg
     imagemagick
     jax

From 1fa650463cf0f5abad01667859175c3092f7aa09 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 22 Jun 2025 12:42:32 +0200
Subject: [PATCH 49/59] ci/OWNERS: add kernel team to relevant files

This should prevent situations like
https://github.com/NixOS/nixpkgs/pull/389291 in future where a new
kernel variant was added without any discussion with the kernel team.
---
 ci/OWNERS | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ci/OWNERS b/ci/OWNERS
index 10b63db72ee2..7866a8e36e65 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -298,6 +298,10 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /pkgs/servers/home-assistant @mweinelt
 /pkgs/by-name/es/esphome @mweinelt
 
+# Linux kernel
+/pkgs/top-level/linux-kernels.nix @NixOS/linux-kernel
+/pkgs/os-specific/linux/kernel/ @NixOS/linux-kernel
+
 # Network Time Daemons
 /pkgs/by-name/ch/chrony @thoughtpolice
 /pkgs/by-name/nt/ntp @thoughtpolice

From 577bb801ec758641bc5b8f5d4d6e9a95d6146cbe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Jun 2025 15:39:00 +0000
Subject: [PATCH 50/59] vscode-extensions.devsense.composer-php-vscode:
 1.59.17466 -> 1.59.17515

---
 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 3284df0dc3c3..022785c312c2 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1345,8 +1345,8 @@ let
         mktplcRef = {
           name = "composer-php-vscode";
           publisher = "devsense";
-          version = "1.59.17466";
-          hash = "sha256-efgwdF1bRE4sngayKq0fcFWDNtvkX+tgEKbF3RyYY68=";
+          version = "1.59.17515";
+          hash = "sha256-unqWaEtShJHqol0tV4ocb0nI81rWFQuv/W1i+2zMeZM=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DEVSENSE.composer-php-vscode/changelog";

From aed02e7af1bc3073f8e5baa8c01d729c290e12ae Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 21 Jun 2025 12:41:09 +0200
Subject: [PATCH 51/59] python3Packages.textual: 3.4.0 -> 3.5.0

Diff: https://github.com/Textualize/textual/compare/refs/tags/v3.4.0...refs/tags/v3.5.0

Changelog: https://github.com/Textualize/textual/blob/v3.5.0/CHANGELOG.md
---
 pkgs/development/python-modules/textual/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix
index 4642d29e4d94..01d28016734d 100644
--- a/pkgs/development/python-modules/textual/default.nix
+++ b/pkgs/development/python-modules/textual/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "textual";
-  version = "3.4.0";
+  version = "3.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = "textual";
     tag = "v${version}";
-    hash = "sha256-oI0W4KjGHmAGsPFBT2yMWDOLolNPkNOBcLv1K/+dqMc=";
+    hash = "sha256-mr/pzW6EhB+STtVHW1a/+CivzPINHEvvYWnCizycjeo=";
   };
 
   build-system = [ poetry-core ];

From 177f922fcc427f67a7e8f16a0634f235dc30f6ee Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 21 Jun 2025 15:58:53 +0200
Subject: [PATCH 52/59] memray: skip failing tests

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

diff --git a/pkgs/by-name/me/memray/package.nix b/pkgs/by-name/me/memray/package.nix
index 09140b5e9bc2..05ac47765a1f 100644
--- a/pkgs/by-name/me/memray/package.nix
+++ b/pkgs/by-name/me/memray/package.nix
@@ -58,6 +58,14 @@ python3Packages.buildPythonApplication rec {
     # Import issue
     "test_header_allocator"
     "test_hybrid_stack_of_allocations_inside_ceval"
+
+    # The following snapshot tests started failing since updating textual to 3.5.0
+    "TestTUILooks"
+    "test_merge_threads"
+    "test_tui_basic"
+    "test_tui_gradient"
+    "test_tui_pause"
+    "test_unmerge_threads"
   ];
 
   disabledTestPaths = [

From 687ce9463bc21af5abf2ba88bec657fb9a6834ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Jun 2025 16:20:32 +0000
Subject: [PATCH 53/59] ghostfolio: 2.170.0 -> 2.173.0

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

diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix
index 4838523dea86..f24c301d02c2 100644
--- a/pkgs/by-name/gh/ghostfolio/package.nix
+++ b/pkgs/by-name/gh/ghostfolio/package.nix
@@ -11,13 +11,13 @@
 
 buildNpmPackage rec {
   pname = "ghostfolio";
-  version = "2.170.0";
+  version = "2.173.0";
 
   src = fetchFromGitHub {
     owner = "ghostfolio";
     repo = "ghostfolio";
     tag = version;
-    hash = "sha256-zXT0gSHixUeFaNA0y1JDtR5rrIBQTwlpWPeg9fR4Sf8=";
+    hash = "sha256-+x9xpY0Yd0tj8zZdMbfstMznypn1Up4hxFXkp6bjcAo=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
     '';
   };
 
-  npmDepsHash = "sha256-92MSin46MURmOPFOCobB2646/zl84LTNVwdYQG8Talo=";
+  npmDepsHash = "sha256-0Kme7RwXfxJuJ/6vWPPalvBYhGy0SpRViP5o4YrVeLI=";
 
   nativeBuildInputs = [
     prisma

From aa3ffdc2f9c932508fc2a91bf861ce4eb6465107 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Jun 2025 16:36:12 +0000
Subject: [PATCH 54/59] phpunit: 12.2.2 -> 12.2.3

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

diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix
index b5b10f87d4ba..c3dcf8d5044d 100644
--- a/pkgs/by-name/ph/phpunit/package.nix
+++ b/pkgs/by-name/ph/phpunit/package.nix
@@ -10,16 +10,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phpunit";
-  version = "12.2.2";
+  version = "12.2.3";
 
   src = fetchFromGitHub {
     owner = "sebastianbergmann";
     repo = "phpunit";
     tag = finalAttrs.version;
-    hash = "sha256-CcN+2EuniPvCB0WXKI4IOOWUfguOlVq7lSdYzBNccfs=";
+    hash = "sha256-wdUx2/f+VGaclDO5DtJprqsGuKMXXdw/CE10py19Dvc=";
   };
 
-  vendorHash = "sha256-GLQNRoxwdGm4MWaxyqM4Va5qZgEXFO4AB8IMQL2TAws=";
+  vendorHash = "sha256-zc9ZXFhS78gZ5VevbAs0r+R30+It5BzUkgPau8qLjFE=";
 
   passthru = {
     updateScript = nix-update-script { };

From de22d88acafc95e7d586b9c998485d51c4a8937f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 23 Jun 2025 09:13:04 +0200
Subject: [PATCH 55/59] waybar: 0.12.0-unstable-2025-06-13 -> 0.13.0

Diff: https://github.com/Alexays/Waybar/compare/2c482a29173ffcc03c3e4859808eaef6c9014a1f...2c482a29173ffcc03c3e4859808eaef6c9014a1f

Changelog: https://github.com/alexays/waybar/releases/tag/0.13.0
---
 pkgs/by-name/wa/waybar/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix
index 8d7a91c8623f..3d9112626bc6 100644
--- a/pkgs/by-name/wa/waybar/package.nix
+++ b/pkgs/by-name/wa/waybar/package.nix
@@ -9,6 +9,7 @@
   fftw,
   glib,
   gobject-introspection,
+  gpsd,
   gtk-layer-shell,
   gtkmm3,
   howard-hinnant-date,
@@ -49,6 +50,7 @@
   enableManpages ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
   evdevSupport ? true,
   experimentalPatches ? true,
+  gpsSupport ? true,
   inputSupport ? true,
   jackSupport ? true,
   mpdSupport ? true,
@@ -71,16 +73,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "waybar";
-  version = "0.12.0-unstable-2025-06-13";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "Alexays";
     repo = "Waybar";
-    # TODO: switch back to using tag when a new version is released which
-    # includes the fixes for issues like
-    # https://github.com/Alexays/Waybar/issues/3956
-    rev = "2c482a29173ffcc03c3e4859808eaef6c9014a1f";
-    hash = "sha256-29g4SN3Yr4q7zxYS3dU48i634jVsXHBwUUeALPAHZGM=";
+    tag = finalAttrs.version;
+    hash = "sha256-KfWjYDqJf2jNmYAnmV7EQHweMObEBreUc2G7/LpvvC0=";
   };
 
   postUnpack = lib.optional cavaSupport ''
@@ -127,6 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
       portaudio
     ]
     ++ lib.optional evdevSupport libevdev
+    ++ lib.optional gpsSupport gpsd
     ++ lib.optional inputSupport libinput
     ++ lib.optional jackSupport libjack2
     ++ lib.optional mpdSupport libmpdclient
@@ -149,6 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mapAttrsToList lib.mesonEnable {
       "cava" = cavaSupport && lib.asserts.assertMsg sndioSupport "Sndio support is required for Cava";
       "dbusmenu-gtk" = traySupport;
+      "gps" = gpsSupport;
       "jack" = jackSupport;
       "libevdev" = evdevSupport;
       "libinput" = inputSupport;
@@ -192,8 +193,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   versionCheckProgramArg = "--version";
 
-  # TODO: re-enable after bump to next release.
-  doInstallCheck = false;
+  doInstallCheck = true;
 
   passthru = {
     updateScript = nix-update-script { };

From ed9275adcb12a840e50a2afec72df2655b440c1f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 24 Jun 2025 03:06:48 +1000
Subject: [PATCH 56/59] python3Packages.uiprotect: 7.13.0 -> 7.14.1 (#419323)

https://github.com/uilibs/uiprotect/blob/v7.14.1/CHANGELOG.md
---
 pkgs/development/python-modules/uiprotect/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix
index eb70d05aad2d..0da212286f9d 100644
--- a/pkgs/development/python-modules/uiprotect/default.nix
+++ b/pkgs/development/python-modules/uiprotect/default.nix
@@ -40,7 +40,7 @@
 
 buildPythonPackage rec {
   pname = "uiprotect";
-  version = "7.13.0";
+  version = "7.14.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     owner = "uilibs";
     repo = "uiprotect";
     tag = "v${version}";
-    hash = "sha256-qquFyKtGvm+115XB+i4XqaH07sHgBPTe9XUPvZR274M=";
+    hash = "sha256-e5VfG20hl+SGssNsLMoQ2ULJAcVS6gahNkC6XqRuXb0=";
   };
 
   build-system = [ poetry-core ];

From 3d23a55dbc341d0a324eb4003b6d6805b78b09cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Jun 2025 15:32:05 +0000
Subject: [PATCH 57/59] python3Packages.fedora-messaging: 3.7.1 -> 3.8.0

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

diff --git a/pkgs/development/python-modules/fedora-messaging/default.nix b/pkgs/development/python-modules/fedora-messaging/default.nix
index ddb2a70c6a83..5801d8ab38d3 100644
--- a/pkgs/development/python-modules/fedora-messaging/default.nix
+++ b/pkgs/development/python-modules/fedora-messaging/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "fedora-messaging";
-  version = "3.7.1";
+  version = "3.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fedora-infra";
     repo = "fedora-messaging";
     tag = "v${version}";
-    hash = "sha256-ZITCX6MFPpQvhr3OoFT/yxOubXihrljv5hwntUOSpf4=";
+    hash = "sha256-2EWeJddhD6tV5jRyr3pvWYQBfq6nq0GxeTgL6MRf/jE=";
   };
 
   build-system = [ poetry-core ];

From 8884e1b147a1394a5c9b4cc5c3c3a48abd3fbe70 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 23 Jun 2025 20:37:34 +0300
Subject: [PATCH 58/59] nixos/plasma6: install ktexteditor explicitly

Fixes #419327
---
 nixos/modules/services/desktop-managers/plasma6.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix
index c70bb52966c0..8d668236bff6 100644
--- a/nixos/modules/services/desktop-managers/plasma6.nix
+++ b/nixos/modules/services/desktop-managers/plasma6.nix
@@ -166,6 +166,7 @@ in
             gwenview
             okular
             kate
+            ktexteditor # provides elevated actions for kate
             khelpcenter
             dolphin
             baloo-widgets # baloo information in Dolphin

From a2b5af4710f1f9011a1ac5896b396c39debda090 Mon Sep 17 00:00:00 2001
From: Masum Reza <50095635+JohnRTitor@users.noreply.github.com>
Date: Mon, 23 Jun 2025 23:08:45 +0530
Subject: [PATCH 59/59] limine-install: cleanup, improve type hinting (#416188)

---
 .../boot/loader/limine/limine-install.py      | 107 +++++++++---------
 .../system/boot/loader/limine/limine.nix      |   5 +-
 2 files changed, 53 insertions(+), 59 deletions(-)

diff --git a/nixos/modules/system/boot/loader/limine/limine-install.py b/nixos/modules/system/boot/loader/limine/limine-install.py
index 384584f05db0..1992be83d73a 100644
--- a/nixos/modules/system/boot/loader/limine/limine-install.py
+++ b/nixos/modules/system/boot/loader/limine/limine-install.py
@@ -6,7 +6,7 @@ from typing import Any, Callable, Dict, List, Optional, Tuple
 import datetime
 import hashlib
 import json
-import ctypes
+from ctypes import CDLL
 import os
 import psutil
 import re
@@ -16,20 +16,31 @@ import sys
 import tempfile
 import textwrap
 
+@dataclass
+class BootSpec:
+    system: str
+    init: str
+    kernel: str
+    kernelParams: List[str]
+    label: str
+    toplevel: str
+    specialisations: Dict[str, "BootSpec"]
+    initrd: str | None = None
+    initrdSecrets: str | None = None
 
-limine_dir = None
-can_use_direct_paths = False
 install_config = json.load(open('@configPath@', 'r'))
-libc = ctypes.CDLL("libc.so.6")
+libc = CDLL("libc.so.6")
 
+limine_install_dir: Optional[str] = None
+can_use_direct_paths = False
+paths: Dict[str, bool] = {}
 
-def config(*path: List[str]) -> Optional[Any]:
+def config(*path: str) -> Optional[Any]:
     result = install_config
     for component in path:
         result = result[component]
     return result
 
-
 def get_system_path(profile: str = 'system', gen: Optional[str] = None, spec: Optional[str] = None) -> str:
     basename = f'{profile}-{gen}-link' if gen is not None else profile
     profiles_dir = '/nix/var/nix/profiles'
@@ -52,7 +63,7 @@ def get_profiles() -> List[str]:
 
 
 def get_gens(profile: str = 'system') -> List[Tuple[int, List[str]]]:
-    nix_env = os.path.join(config('nixPath'), 'bin', 'nix-env')
+    nix_env = os.path.join(str(config('nixPath')), 'bin', 'nix-env')
     output = subprocess.check_output([
         nix_env, '--list-generations',
         '-p', get_system_path(profile),
@@ -66,7 +77,7 @@ def get_gens(profile: str = 'system') -> List[Tuple[int, List[str]]]:
 
 
 def is_encrypted(device: str) -> bool:
-    for name, _ in config('luksDevices').items():
+    for name in config('luksDevices'):
         if os.readlink(os.path.join('/dev/mapper', name)) == os.readlink(device):
             return True
 
@@ -76,15 +87,13 @@ def is_encrypted(device: str) -> bool:
 def is_fs_type_supported(fs_type: str) -> bool:
     return fs_type.startswith('vfat')
 
-paths = {}
-
 def get_copied_path_uri(path: str, target: str) -> str:
     result = ''
 
     package_id = os.path.basename(os.path.dirname(path))
     suffix = os.path.basename(path)
     dest_file = f'{package_id}-{suffix}'
-    dest_path = os.path.join(limine_dir, target, dest_file)
+    dest_path = os.path.join(str(limine_install_dir), target, dest_file)
 
     if not os.path.exists(dest_path):
         copy_file(path, dest_path)
@@ -117,20 +126,6 @@ def get_file_uri(profile: str, gen: Optional[str], spec: Optional[str], name: st
 def get_kernel_uri(kernel_path: str) -> str:
     return get_copied_path_uri(kernel_path, "kernels")
 
-
-@dataclass
-class BootSpec:
-    system: str
-    init: str
-    kernel: str
-    kernelParams: List[str]
-    label: str
-    toplevel: str
-    specialisations: Dict[str, "BootSpec"]
-    initrd: str | None = None
-    initrdSecrets: str | None = None
-
-
 def bootjson_to_bootspec(bootjson: dict) -> BootSpec:
     specialisations = bootjson['org.nixos.specialisation.v1']
     specialisations = {k: bootjson_to_bootspec(v) for k, v in specialisations.items()}
@@ -150,12 +145,11 @@ def config_entry(levels: int, bootspec: BootSpec, label: str, time: str) -> str:
         entry += f'module_path: ' + get_kernel_uri(bootspec.initrd) + '\n'
 
     if bootspec.initrdSecrets:
-        initrd_secrets_path = limine_dir + '/kernels/' + os.path.basename(toplevel) + '-secrets'
+        initrd_secrets_path = str(limine_install_dir) + '/kernels/' + os.path.basename(bootspec.toplevel) + '-secrets'
         os.makedirs(initrd_secrets_path)
 
-        old_umask = os.umask()
-        os.umask(0o137)
-        initrd_secrets_path_temp = tempfile.mktemp(os.path.basename(toplevel) + '-secrets')
+        old_umask = os.umask(0o137)
+        initrd_secrets_path_temp = tempfile.mktemp(os.path.basename(bootspec.toplevel) + '-secrets')
 
         if os.system(bootspec.initrdSecrets + " " + initrd_secrets_path_temp) != 0:
             print(f'warning: failed to create initrd secrets for "{label}"', file=sys.stderr)
@@ -235,7 +229,7 @@ def option_from_config(name: str, config_path: List[str], conversion: Callable[[
 
 
 def install_bootloader() -> None:
-    global limine_dir
+    global limine_install_dir
 
     boot_fs = None
 
@@ -244,9 +238,9 @@ def install_bootloader() -> None:
             boot_fs = fs
 
     if config('efiSupport'):
-        limine_dir = os.path.join(config('efiMountPoint'), 'limine')
+        limine_install_dir = os.path.join(str(config('efiMountPoint')), 'limine')
     elif boot_fs and is_fs_type_supported(boot_fs['fsType']) and not is_encrypted(boot_fs['device']):
-        limine_dir = '/boot/limine'
+        limine_install_dir = '/boot/limine'
     else:
         possible_causes = []
         if not boot_fs:
@@ -266,14 +260,14 @@ def install_bootloader() -> None:
             partition formatted as FAT.
         '''))
 
-    if config('secureBoot')['enable'] and not config('secureBoot')['createAndEnrollKeys'] and not os.path.exists("/var/lib/sbctl"):
+    if config('secureBoot', 'enable') and not config('secureBoot', 'createAndEnrollKeys') and not os.path.exists("/var/lib/sbctl"):
         print("There are no sbctl secure boot keys present. Please generate some.")
         sys.exit(1)
 
-    if not os.path.exists(limine_dir):
-        os.makedirs(limine_dir)
+    if not os.path.exists(limine_install_dir):
+        os.makedirs(limine_install_dir)
     else:
-        for dir, dirs, files in os.walk(limine_dir, topdown=True):
+        for dir, dirs, files in os.walk(limine_install_dir, topdown=True):
             for file in files:
                 paths[os.path.join(dir, file)] = False
 
@@ -290,7 +284,7 @@ def install_bootloader() -> None:
     last_gen_json = json.load(open(os.path.join(get_system_path('system', last_gen), 'boot.json'), 'r'))
     last_gen_boot_spec = bootjson_to_bootspec(last_gen_json)
 
-    config_file = config('extraConfig') + '\n'
+    config_file = str(config('extraConfig')) + '\n'
     config_file += textwrap.dedent(f'''
         timeout: {timeout}
         editor_enabled: {editor_enabled}
@@ -334,10 +328,10 @@ def install_bootloader() -> None:
             config_file += generate_config_entry(profile, gen, isFirst)
             isFirst = False
 
-    config_file_path = os.path.join(limine_dir, 'limine.conf')
+    config_file_path = os.path.join(limine_install_dir, 'limine.conf')
     config_file += '\n# NixOS boot entries end here\n\n'
 
-    config_file += config('extraEntries')
+    config_file += str(config('extraEntries'))
 
     with open(f"{config_file_path}.tmp", 'w') as file:
         file.truncate()
@@ -349,13 +343,14 @@ def install_bootloader() -> None:
     paths[config_file_path] = True
 
     for dest_path, source_path in config('additionalFiles').items():
-        dest_path = os.path.join(limine_dir, dest_path)
+        dest_path = os.path.join(limine_install_dir, dest_path)
 
         copy_file(source_path, dest_path)
 
-    limine_binary = os.path.join(config('liminePath'), 'bin', 'limine')
+    limine_binary = os.path.join(str(config('liminePath')), 'bin', 'limine')
     cpu_family = config('hostArchitecture', 'family')
     if config('efiSupport'):
+        boot_file = ""
         if cpu_family == 'x86':
             if config('hostArchitecture', 'bits') == 32:
                 boot_file = 'BOOTIA32.EFI'
@@ -369,8 +364,8 @@ def install_bootloader() -> None:
         else:
             raise Exception(f'Unsupported CPU family: {cpu_family}')
 
-        efi_path = os.path.join(config('liminePath'), 'share', 'limine', boot_file)
-        dest_path = os.path.join(config('efiMountPoint'), 'efi', 'boot' if config('efiRemovable') else 'limine', boot_file)
+        efi_path = os.path.join(str(config('liminePath')), 'share', 'limine', boot_file)
+        dest_path = os.path.join(str(config('efiMountPoint')), 'efi', 'boot' if config('efiRemovable') else 'limine', boot_file)
 
         copy_file(efi_path, dest_path)
 
@@ -383,9 +378,9 @@ def install_bootloader() -> None:
                 print('error: failed to enroll limine config.', file=sys.stderr)
                 sys.exit(1)
 
-        if config('secureBoot')['enable']:
-            sbctl = os.path.join(config('secureBoot')['sbctl'], 'bin', 'sbctl')
-            if config('secureBoot')['createAndEnrollKeys']:
+        if config('secureBoot', 'enable'):
+            sbctl = os.path.join(str(config('secureBoot', 'sbctl')), 'bin', 'sbctl')
+            if config('secureBoot', 'createAndEnrollKeys'):
                 print("TEST MODE: creating and enrolling keys")
                 try:
                     subprocess.run([sbctl, 'create-keys'])
@@ -412,8 +407,8 @@ def install_bootloader() -> None:
             if config('efiRemovable'):
                 print('note: boot.loader.limine.efiInstallAsRemovable is true, no need to add EFI entry.')
             else:
-                efibootmgr = os.path.join(config('efiBootMgrPath'), 'bin', 'efibootmgr')
-                efi_partition = find_mounted_device(config('efiMountPoint'))
+                efibootmgr = os.path.join(str(config('efiBootMgrPath')), 'bin', 'efibootmgr')
+                efi_partition = find_mounted_device(str(config('efiMountPoint')))
                 efi_disk = find_disk_device(efi_partition)
 
                 efibootmgr_output = subprocess.check_output([efibootmgr], stderr=subprocess.STDOUT, universal_newlines=True)
@@ -457,24 +452,24 @@ def install_bootloader() -> None:
         if cpu_family != 'x86':
             raise Exception(f'Unsupported CPU family for BIOS install: {cpu_family}')
 
-        limine_sys = os.path.join(config('liminePath'), 'share', 'limine', 'limine-bios.sys')
-        limine_sys_dest = os.path.join(limine_dir, 'limine-bios.sys')
+        limine_sys = os.path.join(str(config('liminePath')), 'share', 'limine', 'limine-bios.sys')
+        limine_sys_dest = os.path.join(limine_install_dir, 'limine-bios.sys')
 
         copy_file(limine_sys, limine_sys_dest)
 
-        device = config('biosDevice')
+        device = str(config('biosDevice'))
 
         if device == 'nodev':
             print("note: boot.loader.limine.biosSupport is set, but device is set to nodev, only the stage 2 bootloader will be installed.", file=sys.stderr)
             return
-        else:
-            limine_deploy_args = [limine_binary, 'bios-install', device]
+
+        limine_deploy_args: List[str] = [limine_binary, 'bios-install', device]
 
         if config('partitionIndex'):
             limine_deploy_args.append(str(config('partitionIndex')))
 
         if config('forceMbr'):
-            limine_deploy_args += '--force-mbr'
+            limine_deploy_args.append('--force-mbr')
 
         try:
             subprocess.run(limine_deploy_args)
@@ -496,9 +491,9 @@ def main() -> None:
         # it can leave the system in an unbootable state, when a crash/outage
         # happens shortly after an update. To decrease the likelihood of this
         # event sync the efi filesystem after each update.
-        rc = libc.syncfs(os.open(f"{config('efiMountPoint')}", os.O_RDONLY))
+        rc = libc.syncfs(os.open(f"{str(config('efiMountPoint'))}", os.O_RDONLY))
         if rc != 0:
-            print(f"could not sync {config('efiMountPoint')}: {os.strerror(rc)}", file=sys.stderr)
+            print(f"could not sync {str(config('efiMountPoint'))}: {os.strerror(rc)}", file=sys.stderr)
 
 if __name__ == '__main__':
     main()
diff --git a/nixos/modules/system/boot/loader/limine/limine.nix b/nixos/modules/system/boot/loader/limine/limine.nix
index c56474969fcd..92b4de374313 100644
--- a/nixos/modules/system/boot/loader/limine/limine.nix
+++ b/nixos/modules/system/boot/loader/limine/limine.nix
@@ -14,7 +14,7 @@ let
       liminePath = cfg.package;
       efiMountPoint = efi.efiSysMountPoint;
       fileSystems = config.fileSystems;
-      luksDevices = config.boot.initrd.luks.devices;
+      luksDevices = builtins.attrNames config.boot.initrd.luks.devices;
       canTouchEfiVariables = efi.canTouchEfiVariables;
       efiSupport = cfg.efiSupport;
       efiRemovable = cfg.efiInstallAsRemovable;
@@ -45,6 +45,7 @@ in
 
   options.boot.loader.limine = {
     enable = lib.mkEnableOption "the Limine Bootloader";
+    package = lib.mkPackageOption pkgs "limine" { };
 
     enableEditor = lib.mkEnableOption null // {
       description = ''
@@ -117,8 +118,6 @@ in
       '';
     };
 
-    package = lib.mkPackageOption pkgs "limine" { };
-
     efiSupport = lib.mkEnableOption null // {
       default = pkgs.stdenv.hostPlatform.isEfi;
       defaultText = lib.literalExpression "pkgs.stdenv.hostPlatform.isEfi";