From 0a6efe1affa562907326e5695a395d115a546532 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Apr 2026 02:05:56 +0000
Subject: [PATCH 01/24] livekit: 1.10.0 -> 1.10.1

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

diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix
index 320d5aeff5cc..668cd40a68c7 100644
--- a/pkgs/by-name/li/livekit/package.nix
+++ b/pkgs/by-name/li/livekit/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "livekit";
-  version = "1.10.0";
+  version = "1.10.1";
 
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "livekit";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-R1F0PNntBYpsXIDxyrqN/4NUbV5stLQWqcTLrMn1A3E=";
+    hash = "sha256-D1OQUWaDnB4tBy5Rf5hnuqT8CHGnLZKKdpoe+Oe1LpM=";
   };
 
-  vendorHash = "sha256-vNzQm4pKZQ70YWwASMYetV2Esp106w6IAwp4FOYFsfQ=";
+  vendorHash = "sha256-LoJNJZPeS3vZlfFYBJ03XzooVFzSMGgmgbQ8yAq5BhA=";
 
   subPackages = [ "cmd/server" ];
 

From 86d196fad6900b51c7283c28285dccd40e8cd383 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Mon, 24 Nov 2025 15:49:32 -0800
Subject: [PATCH 02/24] wsjtx: add update script

---
 pkgs/applications/radio/wsjtx/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/radio/wsjtx/default.nix b/pkgs/applications/radio/wsjtx/default.nix
index 6aabb7f824eb..387604e423ef 100644
--- a/pkgs/applications/radio/wsjtx/default.nix
+++ b/pkgs/applications/radio/wsjtx/default.nix
@@ -5,6 +5,7 @@
   asciidoc,
   asciidoctor,
   cmake,
+  gitUpdater,
   pkg-config,
   fftw,
   fftwFloat,
@@ -21,13 +22,13 @@
   wrapQtAppsHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "wsjtx";
   version = "2.7.0";
 
   src = fetchgit {
     url = "https://git.code.sf.net/p/wsjt/wsjtx";
-    rev = "wsjtx-${version}";
+    rev = "wsjtx-${finalAttrs.version}";
     hash = "sha256-AAPZTJUhz3x/28B9rk2uwFs1bkcEvaj+hOzAjpsFALQ=";
   };
 
@@ -56,6 +57,11 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "wsjtx-";
+    ignoredVersions = "(-rc).*";
+  };
+
   meta = {
     description = "Weak-signal digital communication modes for amateur radio";
     longDescription = ''
@@ -73,4 +79,4 @@ stdenv.mkDerivation rec {
       numinit
     ];
   };
-}
+})

From f31b67a4c281dd3d3b328d7e10744a1fc0749df1 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Mon, 24 Nov 2025 15:50:46 -0800
Subject: [PATCH 03/24] wsjtx: move to by-name

---
 .../default.nix => by-name/ws/wsjtx/package.nix} | 16 ++++++----------
 pkgs/top-level/all-packages.nix                  |  2 --
 2 files changed, 6 insertions(+), 12 deletions(-)
 rename pkgs/{applications/radio/wsjtx/default.nix => by-name/ws/wsjtx/package.nix} (91%)

diff --git a/pkgs/applications/radio/wsjtx/default.nix b/pkgs/by-name/ws/wsjtx/package.nix
similarity index 91%
rename from pkgs/applications/radio/wsjtx/default.nix
rename to pkgs/by-name/ws/wsjtx/package.nix
index 387604e423ef..81f9ab1e51f1 100644
--- a/pkgs/applications/radio/wsjtx/default.nix
+++ b/pkgs/by-name/ws/wsjtx/package.nix
@@ -13,13 +13,9 @@
   hamlib_4,
   libtool,
   libusb1,
-  qtbase,
-  qtmultimedia,
-  qtserialport,
-  qttools,
+  qt5,
   boost,
   texinfo,
-  wrapQtAppsHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -40,18 +36,18 @@ stdenv.mkDerivation (finalAttrs: {
     hamlib_4 # rigctl
     libtool
     pkg-config
-    qttools
+    qt5.qttools
     texinfo
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
   buildInputs = [
     fftw
     fftwFloat
     hamlib_4
     libusb1
-    qtbase
-    qtmultimedia
-    qtserialport
+    qt5.qtbase
+    qt5.qtmultimedia
+    qt5.qtserialport
     boost
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6fee0170889a..47102f8ebdf7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10936,8 +10936,6 @@ with pkgs;
 
   wrapThunderbird = callPackage ../applications/networking/mailreaders/thunderbird/wrapper.nix { };
 
-  wsjtx = qt5.callPackage ../applications/radio/wsjtx { };
-
   x2gokdriveclient = libsForQt5.callPackage ../applications/networking/remote/x2gokdriveclient { };
 
   x32edit = callPackage ../applications/audio/midas/x32edit.nix { };

From 86abce96b1a86226ab2c4f16af957fb33d16bafc Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Mon, 24 Nov 2025 16:03:46 -0800
Subject: [PATCH 04/24] wsjtz: don't use wsjtx update script

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

diff --git a/pkgs/by-name/ws/wsjtz/package.nix b/pkgs/by-name/ws/wsjtz/package.nix
index ad44eebb5b8f..715b1b60f03b 100644
--- a/pkgs/by-name/ws/wsjtz/package.nix
+++ b/pkgs/by-name/ws/wsjtz/package.nix
@@ -19,6 +19,9 @@ wsjtx.overrideAttrs (
       mv $out/bin/wsjtx_app_version $out/bin/wsjtz_app_version
     '';
 
+    # Source isn't available in Git.
+    passthru = lib.removeAttrs old.passthru [ "updateScript" ];
+
     meta = {
       description = "WSJT-X fork, primarily focused on automation and enhanced functionality";
       homepage = "https://sourceforge.net/projects/wsjt-z/";

From bf4b9cae816ccc94037b7c9d78b380655a3d6266 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Apr 2026 00:02:52 +0000
Subject: [PATCH 05/24] home-manager: 0-unstable-2026-03-13 ->
 0-unstable-2026-04-08

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

diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix
index e3674baf1fd6..32682c11915c 100644
--- a/pkgs/by-name/ho/home-manager/package.nix
+++ b/pkgs/by-name/ho/home-manager/package.nix
@@ -19,14 +19,14 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "home-manager";
-  version = "0-unstable-2026-03-13";
+  version = "0-unstable-2026-04-08";
 
   src = fetchFromGitHub {
     name = "home-manager-source";
     owner = "nix-community";
     repo = "home-manager";
-    rev = "ef12a9a2b0f77c8fa3dda1e7e494fca668909056";
-    hash = "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=";
+    rev = "7ba4ee4228ed36123c7cb75d50524b43514ef992";
+    hash = "sha256-oBYyowo6yfgb95Z78s3uTnAd9KkpJpwzjJbfnpLaM2Y=";
   };
 
   nativeBuildInputs = [

From 4bc2b4b300a75a484a51b5f6c8925f085d645504 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Mon, 13 Apr 2026 01:06:03 -0700
Subject: [PATCH 06/24] wsjtx: 2.7.0 -> 3.0.0

---
 pkgs/by-name/ws/wsjtx/package.nix | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ws/wsjtx/package.nix b/pkgs/by-name/ws/wsjtx/package.nix
index 81f9ab1e51f1..18bd3514c9ff 100644
--- a/pkgs/by-name/ws/wsjtx/package.nix
+++ b/pkgs/by-name/ws/wsjtx/package.nix
@@ -1,10 +1,11 @@
 {
   lib,
   stdenv,
-  fetchgit,
+  fetchFromGitHub,
   asciidoc,
   asciidoctor,
   cmake,
+  nix-update-script,
   gitUpdater,
   pkg-config,
   fftw,
@@ -20,12 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wsjtx";
-  version = "2.7.0";
+  version = "3.0.0";
 
-  src = fetchgit {
-    url = "https://git.code.sf.net/p/wsjt/wsjtx";
-    rev = "wsjtx-${finalAttrs.version}";
-    hash = "sha256-AAPZTJUhz3x/28B9rk2uwFs1bkcEvaj+hOzAjpsFALQ=";
+  src = fetchFromGitHub {
+    owner = "WSJTX";
+    repo = "wsjtx";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ZM46ouS4NyXP7wPsAxY7Uf2mn0CawRiRmqYkkS8yTAU=";
   };
 
   nativeBuildInputs = [
@@ -48,14 +50,17 @@ stdenv.mkDerivation (finalAttrs: {
     qt5.qtbase
     qt5.qtmultimedia
     qt5.qtserialport
+    qt5.qtwebsockets
     boost
   ];
 
   strictDeps = true;
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "wsjtx-";
-    ignoredVersions = "(-rc).*";
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "^v([0-9]\\.[0-9]\\.[0-9])$"
+    ];
   };
 
   meta = {

From b9b29a144417e24768c777bf83c2170e1d7e6578 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Mon, 13 Apr 2026 01:09:08 -0700
Subject: [PATCH 07/24] release-notes: add wsjtx note

---
 doc/release-notes/rl-2605.section.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md
index 32ef54ff4771..8b9a439a32a9 100644
--- a/doc/release-notes/rl-2605.section.md
+++ b/doc/release-notes/rl-2605.section.md
@@ -268,6 +268,9 @@
 
 - Added `lovr` package, a LUA-based game engine for VR and XR applications.
 
+- Updated `wsjtx` from 2.7.0 to 3.0.0 for amateur radio hobbyists who use FT8 and other related digital modes.
+  See the [release notes](https://wsjt.sourceforge.io/Release_Notes.txt) for the changelog.
+
 - `openrgb` was updated to 1.0rc2, which now uses Plugin API version 4.
   Some existing OpenRGB plugins may be incompatible or require updates.
 

From faa8ae302327ae9e1c261fd1d6cf55dda88a8f16 Mon Sep 17 00:00:00 2001
From: Lukas Beierlieb <lukas.beierlieb@cyberus-technology.de>
Date: Mon, 13 Apr 2026 14:14:46 +0200
Subject: [PATCH 08/24] maintainers: add lbeierlieb

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 792be35e4563..4eee39a553bd 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14996,6 +14996,12 @@
     githubId = 120277625;
     name = "LazilyStableProton";
   };
+  lbeierlieb = {
+    email = "lukasbrlb.lb@gmail.com";
+    github = "lbeierlieb";
+    githubId = 16045805;
+    name = "Lukas Beierlieb";
+  };
   lblasc = {
     email = "lblasc@znode.net";
     github = "lblasc";

From 2f768e9ab005933ffc92171b57d23880e415b8ad Mon Sep 17 00:00:00 2001
From: Lukas Beierlieb <lukas.beierlieb@cyberus-technology.de>
Date: Mon, 13 Apr 2026 15:04:19 +0200
Subject: [PATCH 09/24] usbvfiod: init at 0.1.0

---
 pkgs/by-name/us/usbvfiod/package.nix | 49 ++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 pkgs/by-name/us/usbvfiod/package.nix

diff --git a/pkgs/by-name/us/usbvfiod/package.nix b/pkgs/by-name/us/usbvfiod/package.nix
new file mode 100644
index 000000000000..db6f8ffc2ecb
--- /dev/null
+++ b/pkgs/by-name/us/usbvfiod/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "usbvfiod";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "cyberus-technology";
+    repo = "usbvfiod";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-SG5S0wRue/G31XuR2D8xFrbAIhWG3rl+aNjEnhZ7dmI=";
+  };
+
+  cargoHash = "sha256-nTNUC7Tiib2wWYC1g7S1W7wgIkqZLTN8aKUKjpgZlqo=";
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  __structuredAttrs = true;
+
+  meta = {
+    homepage = "https://github.com/cloud-hypervisor/cloud-hypervisor";
+    description = "A tool for USB device pass-through using the vfio-user protocol.";
+    changelog = "https://github.com/cyberus-technology/usb/releases/tag/v${finalAttrs.version}";
+    license = with lib.licenses; [
+      asl20
+      mit
+    ];
+    mainProgram = "usbvfiod";
+    maintainers = with lib.maintainers; [
+      lbeierlieb
+    ];
+    platforms = [
+      "aarch64-linux"
+      "riscv64-linux"
+      "x86_64-linux"
+    ];
+  };
+})

From 05159fe2052721632e47679b4a5dbd2268710a54 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Apr 2026 00:26:55 +0000
Subject: [PATCH 10/24] mtdutils: 2.3.0 -> 2.3.1

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

diff --git a/pkgs/by-name/mt/mtdutils/package.nix b/pkgs/by-name/mt/mtdutils/package.nix
index 0bd438517c9d..ac0df7e3ee61 100644
--- a/pkgs/by-name/mt/mtdutils/package.nix
+++ b/pkgs/by-name/mt/mtdutils/package.nix
@@ -15,12 +15,12 @@
 
 stdenv.mkDerivation rec {
   pname = "mtd-utils";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchgit {
     url = "git://git.infradead.org/mtd-utils.git";
     rev = "v${version}";
-    hash = "sha256-qQ8r0LBxwzdT9q9ILxKD1AfzLimaNHdc9BT3Rox1eXs=";
+    hash = "sha256-+2wHGgwWzjj3DRbU82MLvrwB7AtgMg+7m+0MwPE4V1o=";
   };
 
   nativeBuildInputs = [

From d61198b47161abb59bebe726ea1b7f4b8e5659b3 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 14 Apr 2026 14:43:16 +0200
Subject: [PATCH 11/24] =?UTF-8?q?jasmin-compiler:=202026.03.0=20=E2=86=92?=
 =?UTF-8?q?=202026.03.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/ja/jasmin-compiler/package.nix b/pkgs/by-name/ja/jasmin-compiler/package.nix
index c3955850dee8..acf734393ace 100644
--- a/pkgs/by-name/ja/jasmin-compiler/package.nix
+++ b/pkgs/by-name/ja/jasmin-compiler/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jasmin-compiler";
-  version = "2026.03.0";
+  version = "2026.03.1";
 
   src = fetchurl {
     url = "https://github.com/jasmin-lang/jasmin/releases/download/v${finalAttrs.version}/jasmin-compiler-v${finalAttrs.version}.tar.bz2";
-    hash = "sha256-3sYqPNDNQs/pbsZLPNOWHg6KCfuSzrZBdc/7VP3lDkA=";
+    hash = "sha256-eOn5KWNAPx7Z+VMm8mclUyxDlW8Q/MR9EayUxmojb1I=";
   };
 
   nativeBuildInputs = with ocamlPackages; [

From 23453ae44729734377e35f527eec182cc45d8f2e Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Tue, 14 Apr 2026 17:46:24 +0100
Subject: [PATCH 12/24] nono: 0.5.0 -> 0.35.0

Diff: https://github.com/always-further/nono/compare/v0.5.0...v0.35.0

Changelog: https://github.com/always-further/nono/blob/refs/tags/v0.35.0/CHANGELOG.md

Co-authored-by: Opalbolt <119032768+opalbolt@users.noreply.github.com>
---
 pkgs/by-name/no/nono/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/no/nono/package.nix b/pkgs/by-name/no/nono/package.nix
index 6d626bfe9e95..94829a7ef587 100644
--- a/pkgs/by-name/no/nono/package.nix
+++ b/pkgs/by-name/no/nono/package.nix
@@ -10,16 +10,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nono";
-  version = "0.5.0";
+  version = "0.35.0";
 
   src = fetchFromGitHub {
     owner = "always-further";
     repo = "nono";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-32PiM84dwZ3dPIAIak1DL3iencguXCzehFCDsulDyhI=";
+    hash = "sha256-/bKquUbVMM1e/YPcuSb0vW4tX/3yNDUxmaBWHKFw+Qs=";
   };
-
-  cargoHash = "sha256-nE0vVBThXnqo8VnFCkOyqhpZZ40MIkXSqUoJUZcDVhE=";
+  cargoHash = "sha256-ibGIpH6Ls9nxtF6rRl+dZBbbmVRXDQA6vpPI/jzpDqI=";
 
   nativeBuildInputs = [
     pkg-config

From 936ec49b70f3c12bf553887b3cef015c55af527c Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Tue, 14 Apr 2026 17:46:53 +0100
Subject: [PATCH 13/24] nono: prepare home tmpdir for checks

---
 pkgs/by-name/no/nono/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/no/nono/package.nix b/pkgs/by-name/no/nono/package.nix
index 94829a7ef587..6d68bd9783f6 100644
--- a/pkgs/by-name/no/nono/package.nix
+++ b/pkgs/by-name/no/nono/package.nix
@@ -6,6 +6,8 @@
   pkg-config,
 
   dbus,
+
+  writableTmpDirAsHomeHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -28,6 +30,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     dbus
   ];
 
+  nativeCheckInputs = [
+    writableTmpDirAsHomeHook
+  ];
+
   meta = {
     description = "Secure, kernel-enforced sandbox for AI agents, MCP and LLM workloads";
     homepage = "https://github.com/always-further/nono";

From ade078802c5da6aa08c38db7b5d64ea400ad6b68 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Tue, 14 Apr 2026 21:43:41 +0100
Subject: [PATCH 14/24] swiftlint: convert to finalAttrs, use sources.json

---
 pkgs/by-name/sw/swiftlint/package.nix  | 18 ++++++++++++------
 pkgs/by-name/sw/swiftlint/sources.json | 13 +++++++++++++
 2 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/by-name/sw/swiftlint/sources.json

diff --git a/pkgs/by-name/sw/swiftlint/package.nix b/pkgs/by-name/sw/swiftlint/package.nix
index 11d2d437779f..0e94621adb4f 100644
--- a/pkgs/by-name/sw/swiftlint/package.nix
+++ b/pkgs/by-name/sw/swiftlint/package.nix
@@ -7,13 +7,19 @@
   nix-update-script,
   versionCheckHook,
 }:
-stdenvNoCC.mkDerivation rec {
+let
+  sources = lib.importJSON ./sources.json;
+  platform =
+    sources.platforms.${stdenvNoCC.hostPlatform.system}
+      or (throw "Unsupported platform: ${stdenvNoCC.hostPlatform.system}");
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "swiftlint";
-  version = "0.63.2";
+  inherit (sources) version;
 
   src = fetchurl {
-    url = "https://github.com/realm/SwiftLint/releases/download/${version}/portable_swiftlint.zip";
-    hash = "sha256-xZpAXIX5W5LO1nelAIBOCBWWpMrkpqSFr3YGVVfW7Sk=";
+    url = "https://github.com/realm/SwiftLint/releases/download/${finalAttrs.version}/${platform.filename}";
+    inherit (platform) hash;
   };
 
   dontPatch = true;
@@ -54,7 +60,7 @@ stdenvNoCC.mkDerivation rec {
       matteopacini
       DimitarNestorov
     ];
-    platforms = lib.platforms.darwin;
+    platforms = lib.attrNames sources.platforms;
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
   };
-}
+})
diff --git a/pkgs/by-name/sw/swiftlint/sources.json b/pkgs/by-name/sw/swiftlint/sources.json
new file mode 100644
index 000000000000..2c6cf36a86d4
--- /dev/null
+++ b/pkgs/by-name/sw/swiftlint/sources.json
@@ -0,0 +1,13 @@
+{
+  "version": "0.63.2",
+  "platforms": {
+    "x86_64-darwin": {
+      "filename": "portable_swiftlint.zip",
+      "hash": "sha256-xZpAXIX5W5LO1nelAIBOCBWWpMrkpqSFr3YGVVfW7Sk="
+    },
+    "aarch64-darwin": {
+      "filename": "portable_swiftlint.zip",
+      "hash": "sha256-xZpAXIX5W5LO1nelAIBOCBWWpMrkpqSFr3YGVVfW7Sk="
+    }
+  }
+}

From 3711f6c20e2dd738df3a48baa72ebdbbf7752c01 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Tue, 14 Apr 2026 21:44:00 +0100
Subject: [PATCH 15/24] swiftlint: add linux support

---
 pkgs/by-name/sw/swiftlint/package.nix  | 14 +++++++++-----
 pkgs/by-name/sw/swiftlint/sources.json |  8 ++++++++
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sw/swiftlint/package.nix b/pkgs/by-name/sw/swiftlint/package.nix
index 0e94621adb4f..f8660afc70e6 100644
--- a/pkgs/by-name/sw/swiftlint/package.nix
+++ b/pkgs/by-name/sw/swiftlint/package.nix
@@ -33,11 +33,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   sourceRoot = ".";
 
-  installPhase = ''
-    runHook preInstall
-    install -Dm755 swiftlint $out/bin/swiftlint
-    runHook postInstall
-  '';
+  installPhase =
+    let
+      binary = if stdenvNoCC.hostPlatform.isLinux then "swiftlint-static" else "swiftlint";
+    in
+    ''
+      runHook preInstall
+      install -Dm755 ${binary} $out/bin/swiftlint
+      runHook postInstall
+    '';
 
   postInstall = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) ''
     installShellCompletion --cmd swiftlint \
diff --git a/pkgs/by-name/sw/swiftlint/sources.json b/pkgs/by-name/sw/swiftlint/sources.json
index 2c6cf36a86d4..ef824e9e9828 100644
--- a/pkgs/by-name/sw/swiftlint/sources.json
+++ b/pkgs/by-name/sw/swiftlint/sources.json
@@ -1,6 +1,14 @@
 {
   "version": "0.63.2",
   "platforms": {
+    "x86_64-linux": {
+      "filename": "swiftlint_linux_amd64.zip",
+      "hash": "sha256-3RAXz9IKFFfyZFkLy1h1pu4GzXW5qdT3fNQ6VSSZFDs="
+    },
+    "aarch64-linux": {
+      "filename": "swiftlint_linux_arm64.zip",
+      "hash": "sha256-EE3t/3YhV/XP93UvHMKiibYPPqZ35y1lHG86Mof92Ug="
+    },
     "x86_64-darwin": {
       "filename": "portable_swiftlint.zip",
       "hash": "sha256-xZpAXIX5W5LO1nelAIBOCBWWpMrkpqSFr3YGVVfW7Sk="

From b7c071784e6814ae689d650a039820d7fc73a64a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?=
 <65870+suhr@users.noreply.github.com>
Date: Wed, 15 Apr 2026 03:05:54 +0300
Subject: [PATCH 16/24] gajim: add socks support to httpx

---
 .../applications/networking/instant-messengers/gajim/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index dc2cb1ec1f34..1a2a01727179 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -113,6 +113,7 @@ python3.pkgs.buildPythonApplication rec {
       sqlalchemy
       emoji
       httpx
+      httpx.optional-dependencies.socks
       h2
       truststore
     ]

From 145e6919be0f37020b59a6c8dc8f8b93a7934c92 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Apr 2026 04:43:05 +0000
Subject: [PATCH 17/24] libretro.beetle-psx: 0-unstable-2026-04-03 ->
 0-unstable-2026-04-10

---
 pkgs/applications/emulators/libretro/cores/beetle-psx.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix
index 1e53c0b9a284..09e805d2af59 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix
@@ -8,13 +8,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-psx" + lib.optionalString withHw "-hw";
-  version = "0-unstable-2026-04-03";
+  version = "0-unstable-2026-04-10";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-psx-libretro";
-    rev = "f339f6363de238adcf7c259bff8b0771c9a46399";
-    hash = "sha256-+JV/QQWiAK980ybM63jk6ljsJJWtdVszAFaIWGmzV/4=";
+    rev = "4fdfd541e5dce6f08883883dd27289545825e0b4";
+    hash = "sha256-DtZIi9BRrskfHFLt/UqfZBJp96QmgqGgroxyF7UTRLU=";
   };
 
   extraBuildInputs = lib.optionals withHw [

From 4903deb846078440d2571b379a521c14f1574c07 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 15 Apr 2026 08:57:59 +0200
Subject: [PATCH 18/24] python3Packages.tencentcloud-sdk-python: 3.1.77 ->
 3.1.78

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.1.77...3.1.78

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.1.78/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index e5c80cf60c7f..da45387f51fb 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "tencentcloud-sdk-python";
-  version = "3.1.77";
+  version = "3.1.78";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = finalAttrs.version;
-    hash = "sha256-pLkHUcy8CbEz6f3bNHx+ynJg9snxRphCoKldO//4PmM=";
+    hash = "sha256-hcRbJly7dkCopzTHwwOD77ec8MJh3/2LYuBfh0d55Wc=";
   };
 
   build-system = [ setuptools ];

From ece9935c97c30afffec46e254edacada11188235 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Tue, 14 Apr 2026 21:44:15 +0100
Subject: [PATCH 19/24] swiftlint: add passthru.tests.lint

---
 pkgs/by-name/sw/swiftlint/package.nix | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/sw/swiftlint/package.nix b/pkgs/by-name/sw/swiftlint/package.nix
index f8660afc70e6..6fbbc0347230 100644
--- a/pkgs/by-name/sw/swiftlint/package.nix
+++ b/pkgs/by-name/sw/swiftlint/package.nix
@@ -6,6 +6,7 @@
   installShellFiles,
   nix-update-script,
   versionCheckHook,
+  runCommand,
 }:
 let
   sources = lib.importJSON ./sources.json;
@@ -53,7 +54,25 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = {
+      lint =
+        runCommand "swiftlint-test-lint"
+          {
+            nativeBuildInputs = [ finalAttrs.finalPackage ];
+          }
+          ''
+            printf "class test{}\n\nvar a = 1" > test.swift
+            swiftlint lint ${lib.optionalString stdenvNoCC.hostPlatform.isDarwin "--disable-sourcekit"} test.swift > output.txt 2>&1 || true
+            grep -q "identifier_name" output.txt
+            grep -q "opening_brace" output.txt
+            grep -q "trailing_newline" output.txt
+            grep -q "type_name" output.txt
+            touch $out
+          '';
+    };
+  };
 
   meta = {
     description = "Tool to enforce Swift style and conventions";

From f614a996ccc48b3ac244b2e95962031806efab66 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Tue, 14 Apr 2026 21:44:25 +0100
Subject: [PATCH 20/24] swiftlint: add update.sh

---
 pkgs/by-name/sw/swiftlint/package.nix |  3 +-
 pkgs/by-name/sw/swiftlint/update.sh   | 44 +++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100755 pkgs/by-name/sw/swiftlint/update.sh

diff --git a/pkgs/by-name/sw/swiftlint/package.nix b/pkgs/by-name/sw/swiftlint/package.nix
index 6fbbc0347230..2fa751c74cff 100644
--- a/pkgs/by-name/sw/swiftlint/package.nix
+++ b/pkgs/by-name/sw/swiftlint/package.nix
@@ -4,7 +4,6 @@
   fetchurl,
   unzip,
   installShellFiles,
-  nix-update-script,
   versionCheckHook,
   runCommand,
 }:
@@ -55,7 +54,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
 
   passthru = {
-    updateScript = nix-update-script { };
+    updateScript = ./update.sh;
     tests = {
       lint =
         runCommand "swiftlint-test-lint"
diff --git a/pkgs/by-name/sw/swiftlint/update.sh b/pkgs/by-name/sw/swiftlint/update.sh
new file mode 100755
index 000000000000..0839de6e5565
--- /dev/null
+++ b/pkgs/by-name/sw/swiftlint/update.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq nix
+
+set -euo pipefail
+
+cd "$(dirname "$0")"
+
+old_version=$(jq -r ".version" sources.json)
+version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
+  "https://api.github.com/repos/realm/SwiftLint/releases/latest" | jq -r ".tag_name")
+
+if [[ "$old_version" == "$version" ]]; then
+    echo "swiftlint is already up to date at $version"
+    exit 0
+fi
+
+echo "Updating swiftlint from $old_version to $version"
+
+declare -A platforms=(
+    [x86_64-linux]="swiftlint_linux_amd64.zip"
+    [aarch64-linux]="swiftlint_linux_arm64.zip"
+    [x86_64-darwin]="portable_swiftlint.zip"
+    [aarch64-darwin]="portable_swiftlint.zip"
+)
+
+sources_tmp="$(mktemp)"
+jq -n --arg v "$version" '{version: $v, platforms: {}}' > "$sources_tmp"
+
+for platform in "${!platforms[@]}"; do
+    filename="${platforms[$platform]}"
+    url="https://github.com/realm/SwiftLint/releases/download/${version}/${filename}"
+    echo "Fetching hash for $platform ($filename)..."
+    sha256hash="$(nix-prefetch-url --type sha256 "$url")"
+    hash="$(nix hash convert --to sri --hash-algo sha256 "$sha256hash")"
+    jq --arg platform "$platform" \
+       --arg filename "$filename" \
+       --arg hash "$hash" \
+       '.platforms += {($platform): {filename: $filename, hash: $hash}}' \
+       "$sources_tmp" > "${sources_tmp}.tmp" && mv "${sources_tmp}.tmp" "$sources_tmp"
+done
+
+mv "$sources_tmp" sources.json
+
+echo "Updated swiftlint to $version"

From 363702c5c5eb911b33bc3188a5aa14ddafc3ac75 Mon Sep 17 00:00:00 2001
From: BatteredBunny <ayes2022@protonmail.com>
Date: Wed, 15 Apr 2026 11:20:31 +0300
Subject: [PATCH 21/24] jellyfin-mpv-shim: Clean up

---
 .../video/jellyfin-mpv-shim/default.nix        | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix
index 3a1658a70d2e..78b2343ee6dc 100644
--- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix
+++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix
@@ -13,6 +13,7 @@
   python,
   python-mpv-jsonipc,
   pywebview,
+  setuptools,
   tkinter,
   wrapGAppsHook3,
 }:
@@ -20,7 +21,7 @@
 buildPythonApplication rec {
   pname = "jellyfin-mpv-shim";
   version = "2.9.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
@@ -33,7 +34,9 @@ buildPythonApplication rec {
     gobject-introspection
   ];
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     jellyfin-apiclient-python
     mpv
     pillow
@@ -61,12 +64,12 @@ buildPythonApplication rec {
 
   postPatch = ''
     substituteInPlace jellyfin_mpv_shim/conf.py \
-      --replace "check_updates: bool = True" "check_updates: bool = False" \
-      --replace "notify_updates: bool = True" "notify_updates: bool = False"
+      --replace-fail "check_updates: bool = True" "check_updates: bool = False" \
+      --replace-fail "notify_updates: bool = True" "notify_updates: bool = False"
     # python-mpv renamed to mpv with 1.0.4
     substituteInPlace setup.py \
-      --replace "python-mpv" "mpv" \
-      --replace "mpv-jsonipc" "python_mpv_jsonipc"
+      --replace-fail "python-mpv" "mpv" \
+      --replace-fail "mpv-jsonipc" "python_mpv_jsonipc"
   '';
 
   # Install all the icons for the desktop item
@@ -84,8 +87,6 @@ buildPythonApplication rec {
   '';
   dontWrapGApps = true;
 
-  # no tests
-  doCheck = false;
   pythonImportsCheck = [ "jellyfin_mpv_shim" ];
 
   desktopItems = [
@@ -113,6 +114,7 @@ buildPythonApplication rec {
       to prevent needless transcoding of your media files on the server. The player also has
       advanced features, such as bulk subtitle updates and launching commands on events.
     '';
+    changelog = "https://github.com/jellyfin/jellyfin-mpv-shim/releases/tag/v${version}";
     license = with lib.licenses; [
       # jellyfin-mpv-shim
       gpl3Only

From 7230cbb016a5f285ef8155f9101616dc49a5590f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Apr 2026 08:33:38 +0000
Subject: [PATCH 22/24] steam-devices-udev-rules: 1.0.0.61-unstable-2026-01-23
 -> 1.0.0.61-unstable-2026-04-14

---
 pkgs/by-name/st/steam-devices-udev-rules/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/steam-devices-udev-rules/package.nix b/pkgs/by-name/st/steam-devices-udev-rules/package.nix
index a6158a389a42..2e5f99e8ec92 100644
--- a/pkgs/by-name/st/steam-devices-udev-rules/package.nix
+++ b/pkgs/by-name/st/steam-devices-udev-rules/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "steam-devices-udev-rules";
-  version = "1.0.0.61-unstable-2026-01-23";
+  version = "1.0.0.61-unstable-2026-04-14";
 
   src = fetchFromGitHub {
     owner = "ValveSoftware";
     repo = "steam-devices";
-    rev = "e0ab31454b1c55468af14d08740b51f11581a324";
-    hash = "sha256-tuQu6s16bupaHw/u64VJxLC4qMdMBvgx7Df8LaPa0Sg=";
+    rev = "7dde9ecb3c386363ecd9bd0a3b77e4756d200704";
+    hash = "sha256-44ZO2etUxnldRCuNp6KpLArPrfAOuVPoXW1fl+KbHXA=";
   };
 
   nativeBuildInputs = [

From 42e6a3c3059ece1203393bc9351f7fa828acbd75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Apr 2026 08:47:58 +0000
Subject: [PATCH 23/24] clipcat: 0.24.1 -> 0.25.0

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

diff --git a/pkgs/by-name/cl/clipcat/package.nix b/pkgs/by-name/cl/clipcat/package.nix
index 1b91c4cdcad4..7fe59a45b88c 100644
--- a/pkgs/by-name/cl/clipcat/package.nix
+++ b/pkgs/by-name/cl/clipcat/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "clipcat";
-  version = "0.24.1";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "xrelkd";
     repo = "clipcat";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MbbrkXbXMxWh4fwWg5cIA9Hdibo1qZU7fv5h2oe8KOs=";
+    hash = "sha256-ht+9TFugVckj5xCCHgwPHbXqeJRBP4MzBROMBIbYAYI=";
   };
 
-  cargoHash = "sha256-cJK3ZBlVvd+coDsVwux2qUD0JQadjtJ7ToNcrpYHXZ4=";
+  cargoHash = "sha256-pejtrvCD1HkAZ+pMynRRLw+EV/pHwzh/7OnnoI5LHoc=";
 
   nativeBuildInputs = [
     protobuf

From ba315d644728f8b888e34d3489824dc13feaaaf0 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Wed, 15 Apr 2026 10:18:55 +0100
Subject: [PATCH 24/24] nono: skip test failures on darwin

---
 pkgs/by-name/no/nono/package.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pkgs/by-name/no/nono/package.nix b/pkgs/by-name/no/nono/package.nix
index 6d68bd9783f6..047da60943cc 100644
--- a/pkgs/by-name/no/nono/package.nix
+++ b/pkgs/by-name/no/nono/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   rustPlatform,
   fetchFromGitHub,
 
@@ -34,6 +35,29 @@ rustPlatform.buildRustPackage (finalAttrs: {
     writableTmpDirAsHomeHook
   ];
 
+  checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [
+    # panics with "Deny-within-allow overlap on Linux ... Landlock cannot enforce this. ..."
+    # landlock is linux only
+    "--skip=policy::tests::test_all_groups_no_deny_within_allow_overlap"
+    # panics with "exact-path fallback must not recursively cover descendants"
+    "--skip=capability_ext::tests::test_from_profile_allow_file_falls_back_to_exact_directory_when_present"
+
+    # env_vars
+    # don't work inside of the /nix dir
+    # unsure why home is still under /nix with writableTmpDirAsHomeHook
+    # Sandbox initialization failed: Refusing to grant '/nix' (source: group:system_read_macos) because it overlaps protected nono state root '/nix/build/nix-<ID>/.home/.nono'.
+    "--skip=allow_net_overrides_profile_external_proxy"
+    "--skip=cli_flag_overrides_env_var"
+    "--skip=env_nono_allow_comma_separated"
+    "--skip=env_nono_block_net"
+    "--skip=env_nono_block_net_accepts_true"
+    "--skip=env_nono_network_profile"
+    "--skip=env_nono_profile"
+    "--skip=env_nono_upstream_bypass_comma_separated"
+    "--skip=env_nono_upstream_proxy"
+    "--skip=legacy_env_nono_net_block_still_works"
+  ];
+
   meta = {
     description = "Secure, kernel-enforced sandbox for AI agents, MCP and LLM workloads";
     homepage = "https://github.com/always-further/nono";