From 9a825a321aba947a47e1a6e0e788d4b974e7cc94 Mon Sep 17 00:00:00 2001
From: Friedrich Altheide <11352905+FriedrichAltheide@users.noreply.github.com>
Date: Thu, 31 Oct 2024 16:18:23 +0100
Subject: [PATCH 01/48] virtualbox/virtualboxGuestAdditions: update/fix license
 to gpl3Only

https://www.virtualbox.org/wiki/Download_Old_Builds_7_0
https://www.virtualbox.org/wiki/Licensing_FAQ
---
 pkgs/applications/virtualization/virtualbox/default.nix         | 2 +-
 .../virtualization/virtualbox/guest-additions/default.nix       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index b1c04d305393..a06d91df079d 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -392,7 +392,7 @@ stdenv.mkDerivation (finalAttrs: {
       fromSource
       binaryNativeCode
     ];
-    license = lib.licenses.gpl2;
+    license = lib.licenses.gpl3Only;
     homepage = "https://www.virtualbox.org/";
     maintainers = with lib.maintainers; [
       sander
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index e213860a7584..a5502ef61929 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -134,7 +134,7 @@ stdenv.mkDerivation {
       host/guest clipboard support.
     '';
     sourceProvenance = with lib.sourceTypes; [ fromSource ];
-    license = lib.licenses.gpl2;
+    license = lib.licenses.gpl3Only;
     maintainers = [
       lib.maintainers.sander
       lib.maintainers.friedrichaltheide

From b1bc2389d414a5baf5b21d27fb9096e32852c1a1 Mon Sep 17 00:00:00 2001
From: Tanya <tanyaarora1866@gmail.com>
Date: Mon, 7 Apr 2025 23:24:41 +0530
Subject: [PATCH 02/48] ferdium: 7.0.0 -> 7.0.1

---
 .../networking/instant-messengers/ferdium/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/pkgs/applications/networking/instant-messengers/ferdium/default.nix
index 606732baf580..2616621ad27c 100644
--- a/pkgs/applications/networking/instant-messengers/ferdium/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix
@@ -15,15 +15,15 @@ let
     ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   hash =
     {
-      amd64-linux_hash = "sha256-Ey2FhekQVSYB0ki4U3HyuKs/URgtZMCl41jkPsZMNrQ=";
-      arm64-linux_hash = "sha256-oiimMFwwkBOwqlCSFoGQSYHsDpcjTQingyuBkYz8fvA=";
+      amd64-linux_hash = "sha256-e5O8cvQqvymHQiu7kY1AhKfoVOsDLYK8hDX+PKgZPFs=";
+      arm64-linux_hash = "sha256-UskXFGxAFOrAK8bIXRHSwN0G1lakGyuRGXTYYRFKHaw=";
     }
     ."${arch}-linux_hash";
 in
 mkFranzDerivation rec {
   pname = "ferdium";
   name = "Ferdium";
-  version = "7.0.0";
+  version = "7.0.1";
   src = fetchurl {
     url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-${arch}.deb";
     inherit hash;

From 6c7756d92437c7432bb656c3738ba6846f9e12bb Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Sun, 20 Apr 2025 12:22:38 -0400
Subject: [PATCH 03/48] nixos/lk-jwt-service: init

---
 nixos/modules/module-list.nix                 |  1 +
 .../services/matrix/lk-jwt-service.nix        | 93 +++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 nixos/modules/services/matrix/lk-jwt-service.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 8ecdc692ef5d..5dd000bb15d5 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -750,6 +750,7 @@
   ./services/matrix/dendrite.nix
   ./services/matrix/hebbot.nix
   ./services/matrix/hookshot.nix
+  ./services/matrix/lk-jwt-service.nix
   ./services/matrix/matrix-alertmanager.nix
   ./services/matrix/maubot.nix
   ./services/matrix/mautrix-meta.nix
diff --git a/nixos/modules/services/matrix/lk-jwt-service.nix b/nixos/modules/services/matrix/lk-jwt-service.nix
new file mode 100644
index 000000000000..9092b68a58bf
--- /dev/null
+++ b/nixos/modules/services/matrix/lk-jwt-service.nix
@@ -0,0 +1,93 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.lk-jwt-service;
+in
+{
+  meta.maintainers = [ lib.maintainers.quadradical ];
+  options.services.lk-jwt-service = {
+    enable = lib.mkEnableOption "Enable lk-jwt-service";
+    package = lib.mkPackageOption pkgs "lk-jwt-service" { };
+
+    livekitUrl = lib.mkOption {
+      type = lib.types.strMatching "^wss?://.*";
+      example = "wss://example.com/livekit/sfu";
+      description = ''
+        The public websocket URL for livekit.
+        The proto needs to be either  `wss://` (recommended) or `ws://` (insecure).
+      '';
+    };
+
+    keyFile = lib.mkOption {
+      type = lib.types.path;
+      description = ''
+        Path to a file containing the credential mapping (`<keyname>: <secret>`) to access LiveKit.
+
+        Example:
+        ```
+          lk-jwt-service: f6lQGaHtM5HfgZjIcec3cOCRfiDqIine4CpZZnqdT5cE
+        ```
+
+        For more information, see <https://github.com/element-hq/lk-jwt-service#configuration>.
+      '';
+    };
+
+    port = lib.mkOption {
+      type = lib.types.port;
+      default = 8080;
+      description = "Port that lk-jwt-service should listen on.";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd.services.lk-jwt-service = {
+      description = "Minimal service to issue LiveKit JWTs for MatrixRTC";
+      documentation = [ "https://github.com/element-hq/lk-jwt-service" ];
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "network-online.target" ];
+      after = [ "network-online.target" ];
+      environment = {
+        LIVEKIT_URL = cfg.livekitUrl;
+        LIVEKIT_JWT_PORT = toString cfg.port;
+        LIVEKIT_KEY_FILE = "/run/credentials/lk-jwt-service.service/livekit-secrets";
+      };
+
+      serviceConfig = {
+        LoadCredential = [ "livekit-secrets:${cfg.keyFile}" ];
+        ExecStart = lib.getExe cfg.package;
+        DynamicUser = true;
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        PrivateDevices = true;
+        PrivateMounts = true;
+        PrivateUsers = true;
+        RestrictAddressFamilies = [
+          "AF_INET"
+          "AF_INET6"
+        ];
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        ProtectHome = true;
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          "@system-service"
+          "~@privileged"
+          "~@resources"
+        ];
+        Restart = "on-failure";
+        RestartSec = 5;
+        UMask = "077";
+      };
+    };
+  };
+}

From d237673ba4c235203c4544336beee707ca528fc2 Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Sun, 20 Apr 2025 12:22:51 -0400
Subject: [PATCH 04/48] nixos/livekit: init

---
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/networking/livekit.nix | 141 ++++++++++++++++++
 2 files changed, 142 insertions(+)
 create mode 100644 nixos/modules/services/networking/livekit.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 5dd000bb15d5..6be35ec7011e 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1178,6 +1178,7 @@
   ./services/networking/lambdabot.nix
   ./services/networking/legit.nix
   ./services/networking/libreswan.nix
+  ./services/networking/livekit.nix
   ./services/networking/lldpd.nix
   ./services/networking/logmein-hamachi.nix
   ./services/networking/lokinet.nix
diff --git a/nixos/modules/services/networking/livekit.nix b/nixos/modules/services/networking/livekit.nix
new file mode 100644
index 000000000000..b34fc3b61d86
--- /dev/null
+++ b/nixos/modules/services/networking/livekit.nix
@@ -0,0 +1,141 @@
+{
+  config,
+  lib,
+  pkgs,
+  utils,
+  ...
+}:
+let
+  cfg = config.services.livekit;
+  format = pkgs.formats.json { };
+in
+{
+  meta.maintainers = with lib.maintainers; [ quadradical ];
+  options.services.livekit = {
+    enable = lib.mkEnableOption "Enable the livekit server";
+    package = lib.mkPackageOption pkgs "livekit" { };
+
+    keyFile = lib.mkOption {
+      type = lib.types.path;
+      description = ''
+        LiveKit key file holding one or multiple application secrets. Use `livekit-server generate-keys` to generate a random key name and secret.
+
+        The file should have the format `<keyname>: <secret>`. Example:
+        ```
+          lk-jwt-service: f6lQGaHtM5HfgZjIcec3cOCRfiDqIine4CpZZnqdT5cE
+        ```
+
+        Individual key/secret pairs need to be passed to clients to connect to this instance.
+      '';
+    };
+
+    openFirewall = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "Opens port range for LiveKit on the firewall.";
+    };
+
+    settings = lib.mkOption {
+      type = lib.types.submodule {
+        freeformType = format.type;
+        options = {
+          port = lib.mkOption {
+            type = lib.types.port;
+            default = 7880;
+            description = "Main TCP port for RoomService and RTC endpoint.";
+          };
+
+          rtc = {
+            port_range_start = lib.mkOption {
+              type = lib.types.int;
+              default = 50000;
+              description = "Start of UDP port range for WebRTC";
+            };
+
+            port_range_end = lib.mkOption {
+              type = lib.types.int;
+              default = 51000;
+              description = "End of UDP port range for WebRTC";
+            };
+
+            use_external_ip = lib.mkOption {
+              type = lib.types.bool;
+              default = false;
+              description = ''
+                When set to true, attempts to discover the host's public IP via STUN.
+                This is useful for cloud environments such as AWS & Google where hosts have an internal IP that maps to an external one.
+              '';
+            };
+          };
+        };
+      };
+      default = { };
+      description = ''
+        LiveKit configuration file expressed in nix.
+
+        For an example configuration, see <https://docs.livekit.io/home/self-hosting/deployment/#configuration>.
+        For all possible values, see <https://github.com/livekit/livekit/blob/master/config-sample.yaml>.
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    networking.firewall = lib.mkIf cfg.openFirewall {
+      allowedTCPPorts = [
+        cfg.settings.port
+      ];
+      allowedUDPPortRanges = [
+        {
+          from = cfg.settings.rtc.port_range_start;
+          to = cfg.settings.rtc.port_range_end;
+        }
+      ];
+    };
+
+    systemd.services.livekit = {
+      description = "LiveKit SFU server";
+      documentation = [ "https://docs.livekit.io" ];
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "network-online.target" ];
+      after = [ "network-online.target" ];
+
+      serviceConfig = {
+        LoadCredential = [ "livekit-secrets:${cfg.keyFile}" ];
+        ExecStart = utils.escapeSystemdExecArgs [
+          (lib.getExe cfg.package)
+          "--config=${format.generate "livekit.json" cfg.settings}"
+          "--key-file=/run/credentials/livekit.service/livekit-secrets"
+        ];
+        DynamicUser = true;
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        ProtectClock = true;
+        ProtectControlGroups = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        PrivateDevices = true;
+        PrivateMounts = true;
+        PrivateUsers = true;
+        RestrictAddressFamilies = [
+          "AF_INET"
+          "AF_INET6"
+          "AF_NETLINK"
+        ];
+        RestrictNamespaces = true;
+        RestrictRealtime = true;
+        ProtectHome = true;
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          "@system-service"
+          "~@privileged"
+          "~@resources"
+        ];
+        Restart = "on-failure";
+        RestartSec = 5;
+        UMask = "077";
+      };
+    };
+  };
+}

From 6c701a95731bee556ae5b27482e0a9230634780e Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Wed, 23 Apr 2025 00:35:03 +1000
Subject: [PATCH 05/48] nixos/networking: fix `fqdnOrHostName` when FQDN
 explictly set

---
 nixos/modules/tasks/network-interfaces.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index fed91d189fa9..fb8dab1c33ff 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -604,17 +604,21 @@ in
     networking.fqdnOrHostName = mkOption {
       readOnly = true;
       type = types.str;
-      default = if cfg.domain == null then cfg.hostName else cfg.fqdn;
+      default =
+        if (cfg.domain != null || opt.fqdn.highestPrio < (mkOptionDefault { }).priority) then
+          cfg.fqdn
+        else
+          cfg.hostName;
       defaultText = literalExpression ''
-        if cfg.domain == null then cfg.hostName else cfg.fqdn
+        if config.networking.domain != null || config.networking.fqdn is set then config.networking.fqdn else config.networking.hostName
       '';
       description = ''
         Either the fully qualified domain name (FQDN), or just the host name if
-        it does not exists.
+        it does not exist.
 
         This is a convenience option for modules to read instead of `fqdn` when
         a mere `hostName` is also an acceptable value; this option does not
-        throw an error when `domain` is unset.
+        throw an error when `domain` or `fqdn` is unset.
       '';
     };
 

From db606b7ebeffe13165a6f1f5799a2ac78960a59d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Apr 2025 22:33:33 +0000
Subject: [PATCH 06/48] source-meta-json-schema: 9.1.0 -> 9.2.1

---
 pkgs/by-name/so/source-meta-json-schema/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/so/source-meta-json-schema/package.nix b/pkgs/by-name/so/source-meta-json-schema/package.nix
index ed8ab7021c7e..7ab6a7fa64ac 100644
--- a/pkgs/by-name/so/source-meta-json-schema/package.nix
+++ b/pkgs/by-name/so/source-meta-json-schema/package.nix
@@ -5,7 +5,7 @@
   cmake,
 }:
 let
-  version = "9.1.0";
+  version = "9.2.1";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "source-meta-json-schema";
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "sourcemeta";
     repo = "jsonschema";
     rev = "v${version}";
-    hash = "sha256-YxIRDTAAvkltT4HGUvPt/davarGRfE808OoI9UheqCA=";
+    hash = "sha256-VWq0BPVQRUmMXf6YZ4lid7EPPERA818UqE18EtayUus=";
   };
 
   nativeBuildInputs = [

From 6fbc2a63853669169f2d5ba5305e4db8804ee8a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Sun, 27 Apr 2025 14:11:02 +0200
Subject: [PATCH 07/48] littlenavmap: 3.0.16 -> 3.0.17

---
 pkgs/by-name/li/littlenavmap/atools.nix  | 4 ++--
 pkgs/by-name/li/littlenavmap/package.nix | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/li/littlenavmap/atools.nix b/pkgs/by-name/li/littlenavmap/atools.nix
index c24c675f3c3c..3072f02f4e55 100644
--- a/pkgs/by-name/li/littlenavmap/atools.nix
+++ b/pkgs/by-name/li/littlenavmap/atools.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "atools";
-  version = "4.0.16";
+  version = "4.0.17";
 
   src = fetchFromGitHub {
     owner = "albar965";
     repo = "atools";
     tag = "v${version}";
-    hash = "sha256-wPDE2CUHrf/WoksInYZ9UBEBMISqIkBYcMVu0NaxbmE=";
+    hash = "sha256-R5CbMdT8UsPiiIXFhmdAmNa1fKLPfUrWunlbwsHOVow=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/littlenavmap/package.nix b/pkgs/by-name/li/littlenavmap/package.nix
index 3648037ef2eb..8ebe6e9dce63 100644
--- a/pkgs/by-name/li/littlenavmap/package.nix
+++ b/pkgs/by-name/li/littlenavmap/package.nix
@@ -14,7 +14,7 @@ let
     src = fetchFromGitHub {
       owner = "albar965";
       repo = "marble";
-      rev = "722acf7f8d79023f6c6a761063645a1470bb3935";
+      rev = "722acf7f8d79023f6c6a761063645a1470bb3935"; # branch lnm/1.1
       hash = "sha256-5GSa+xIQS9EgJXxMFUOA5jTtHJ6Dl4C9yAkFPIOrgo8=";
     };
 
@@ -69,13 +69,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: rec {
   inherit pname;
-  version = "3.0.16";
+  version = "3.0.17";
 
   src = fetchFromGitHub {
     owner = "albar965";
     repo = "littlenavmap";
-    rev = "v${version}";
-    hash = "sha256-QUgQV8WOAVowjGFpNbzl32gksQ2OnWtLfrJmBK2lJ6M=";
+    tag = "v${version}";
+    hash = "sha256-/1YB2uEQzT0K6IylpWDqOaMSENDR9GuyJNty+2C8kXM=";
   };
 
   nativeBuildInputs = [

From 9994606e6c88d0b74c8e3591d5d9e551d9056374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Sun, 27 Apr 2025 14:31:33 +0200
Subject: [PATCH 08/48] vdrPlugins.markad: 4.2.10 -> 4.2.12

---
 pkgs/applications/video/vdr/markad/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix
index d778c762c5b4..b085b465528e 100644
--- a/pkgs/applications/video/vdr/markad/default.nix
+++ b/pkgs/applications/video/vdr/markad/default.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "vdr-markad";
-  version = "4.2.10";
+  version = "4.2.12";
 
   src = fetchFromGitHub {
     repo = "vdr-plugin-markad";
     owner = "kfb77";
-    hash = "sha256-qnE/0gnuY982qYz3ouUKFPURNkxM0XKWqf3w5ZwczV0=";
-    rev = "V${version}";
+    hash = "sha256-b2DSHbjMnRSY4pf5gSizU3Jbq8gEGC5xFYHCdIaYMfs=";
+    tag = "V${version}";
   };
 
   buildInputs = [

From f316d867da880cc12edcc2905402ccb15c41c0a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Sun, 27 Apr 2025 14:31:51 +0200
Subject: [PATCH 09/48] vdrPlugins.nopacity: 1.1.18 -> 1.1.19

---
 pkgs/applications/video/vdr/nopacity/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/vdr/nopacity/default.nix b/pkgs/applications/video/vdr/nopacity/default.nix
index 6c04f49fb49a..84e8e48ab7b6 100644
--- a/pkgs/applications/video/vdr/nopacity/default.nix
+++ b/pkgs/applications/video/vdr/nopacity/default.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "vdr-skin-nopacity";
-  version = "1.1.18";
+  version = "1.1.19";
 
   src = fetchFromGitLab {
     repo = "SkinNopacity";
     owner = "kamel5";
-    hash = "sha256-Aq5PtD6JV8jdBURADl9KkdVQvfmeQD/Zh62g5ansuC4=";
-    rev = version;
+    hash = "sha256-f15KtoPLvB5bF//5+gmmDmx8MGmiIDPGOYoNgSkcVqM=";
+    tag = version;
   };
 
   buildInputs = [

From 033b0fe378c49d8d9dfc58c5c9cab337f4fdec49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Sun, 27 Apr 2025 18:43:39 +0200
Subject: [PATCH 10/48] local-ai: 2.26.0 -> 2.28.0

---
 pkgs/by-name/lo/local-ai/package.nix | 40 +++++++++++++++-------------
 pkgs/by-name/lo/local-ai/tests.nix   |  2 +-
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix
index 14832660a7a9..eb9e91b952d6 100644
--- a/pkgs/by-name/lo/local-ai/package.nix
+++ b/pkgs/by-name/lo/local-ai/package.nix
@@ -20,6 +20,7 @@
   ncurses,
   which,
   opencv,
+  curl,
 
   enable_upx ? true,
   upx,
@@ -28,11 +29,11 @@
   # https://github.com/NixOS/rfcs/pull/169
 
   # CPU extensions
-  enable_avx ? true,
-  enable_avx2 ? true,
+  enable_avx ? stdenv.hostPlatform.isx86_64,
+  enable_avx2 ? stdenv.hostPlatform.isx86_64,
   enable_avx512 ? stdenv.hostPlatform.avx512Support,
-  enable_f16c ? true,
-  enable_fma ? true,
+  enable_f16c ? stdenv.hostPlatform.isx86_64,
+  enable_fma ? stdenv.hostPlatform.isx86_64,
 
   with_openblas ? false,
   openblas,
@@ -105,10 +106,10 @@ let
       final: prev: {
         name = "llama-cpp-grpc";
         src = fetchFromGitHub {
-          owner = "ggml-org";
+          owner = "ggerganov";
           repo = "llama.cpp";
-          rev = "300907b2110cc17b4337334dc397e05de2d8f5e0";
-          hash = "sha256-7jPgToZ8Xs+8DfXP5WFWZKhqFdYcZ9yFzWVKjvOttIA=";
+          rev = "d6d2c2ab8c8865784ba9fef37f2b2de3f2134d33";
+          hash = "sha256-b9B5I3EbBFrkWc6RLXMWcCRKayyWjlGuQrogUcrISrc=";
           fetchSubmodules = true;
         };
         postPatch =
@@ -116,7 +117,7 @@ let
           + ''
             cd examples
             cp -r --no-preserve=mode ${src}/backend/cpp/llama grpc-server
-            cp llava/clip.* llava/llava.* grpc-server
+            cp llava/clip* llava/llava.* grpc-server
             printf "\nadd_subdirectory(grpc-server)" >> CMakeLists.txt
 
             cp ${src}/backend/backend.proto grpc-server
@@ -137,6 +138,7 @@ let
           protobuf # provides also abseil_cpp as propagated build input
           grpc
           openssl
+          curl
         ];
       }
     )).override
@@ -286,7 +288,7 @@ let
     src = fetchFromGitHub {
       owner = "PABannier";
       repo = "bark.cpp";
-      rev = "v1.0.0";
+      tag = "v1.0.0";
       hash = "sha256-wOcggRWe8lsUzEj/wqOAUlJVypgNFmit5ISs9fbwoCE=";
       fetchSubmodules = true;
     };
@@ -303,10 +305,10 @@ let
   stable-diffusion = stdenv.mkDerivation {
     name = "stable-diffusion";
     src = fetchFromGitHub {
-      owner = "leejet";
+      owner = "richiejp";
       repo = "stable-diffusion.cpp";
-      rev = "d46ed5e184b97c2018dc2e8105925bdb8775e02c";
-      hash = "sha256-5i2HjkdaQEmlUWeHucQyrS8zNS+xyB7Zj+1oA/xsv2k=";
+      rev = "53e3b17eb3d0b5760ced06a1f98320b68b34aaae"; # branch cuda-fix
+      hash = "sha256-z56jafOdibpX+XhRsrc7ieGbeug4bf737/UobqkpBV0=";
       fetchSubmodules = true;
     };
     installPhase = ''
@@ -316,6 +318,9 @@ let
         | tar cf - --null --files-from - \
         | tar xf - -C $out/build
     '';
+    cmakeFlags = [
+      (lib.cmakeFeature "GGML_BUILD_NUMBER" "1")
+    ];
     nativeBuildInputs = [ cmake ];
     buildInputs = [ opencv ];
   };
@@ -331,12 +336,12 @@ let
       stdenv;
 
   pname = "local-ai";
-  version = "2.26.0";
+  version = "2.28.0";
   src = fetchFromGitHub {
     owner = "go-skynet";
     repo = "LocalAI";
-    rev = "v${version}";
-    hash = "sha256-eHylgEbPNQ8CVLlstkeQH6jqYOKfvel1uU5ro8DkLJs=";
+    tag = "v${version}";
+    hash = "sha256-Hpz0dGkgasSY/FGO7mDzqsLjXut0LdQ9PUXGaURUOlY=";
   };
 
   prepare-sources =
@@ -355,7 +360,7 @@ let
   self = buildGo123Module.override { stdenv = effectiveStdenv; } {
     inherit pname version src;
 
-    vendorHash = "sha256-6loR8bvt5BlijufUBVDpxNS/cVCMmbaCwEhYpJKwGys=";
+    vendorHash = "sha256-1OY/y1AeL0K+vOU4Jk/cj7rToVLC9EkkNhgifB+icDM=";
 
     env.NIX_CFLAGS_COMPILE = " -isystem ${opencv}/include/opencv4";
 
@@ -364,7 +369,6 @@ let
         # TODO: add silero-vad
         sed -i Makefile \
           -e '/mod download/ d' \
-          -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-fallback/ d' \
           -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-avx/ d' \
           -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/llama-cpp-cuda/ d' \
           -e '/^ALL_GRPC_BACKENDS+=backend-assets\/grpc\/silero-vad/ d' \
@@ -383,7 +387,7 @@ let
       + ''
         shopt -s extglob
         mkdir -p backend-assets/grpc
-        cp ${llama-cpp-grpc}/bin/grpc-server backend-assets/grpc/llama-cpp-avx2
+        cp ${llama-cpp-grpc}/bin/grpc-server backend-assets/grpc/llama-cpp-fallback
         cp ${llama-cpp-rpc}/bin/grpc-server backend-assets/grpc/llama-cpp-grpc
 
         mkdir -p backend/cpp/llama/llama.cpp
diff --git a/pkgs/by-name/lo/local-ai/tests.nix b/pkgs/by-name/lo/local-ai/tests.nix
index 17f3fb94dd03..ba8479582ca4 100644
--- a/pkgs/by-name/lo/local-ai/tests.nix
+++ b/pkgs/by-name/lo/local-ai/tests.nix
@@ -84,7 +84,7 @@ in
           nodes.machine = {
             imports = [ common-config ];
             virtualisation.cores = 2;
-            virtualisation.memorySize = 4096;
+            virtualisation.memorySize = 3 * 4096;
             services.local-ai.models = models;
           };
           passthru = {

From 7ab13bb106217149ede973e8bb9fdbf69f689f5e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Apr 2025 08:28:37 +0000
Subject: [PATCH 11/48] alacarte: 3.54.1 -> 3.56.0

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

diff --git a/pkgs/by-name/al/alacarte/package.nix b/pkgs/by-name/al/alacarte/package.nix
index 2d4309a193a2..a39f8f9435f2 100644
--- a/pkgs/by-name/al/alacarte/package.nix
+++ b/pkgs/by-name/al/alacarte/package.nix
@@ -17,14 +17,14 @@
 }:
 python3.pkgs.buildPythonApplication rec {
   pname = "alacarte";
-  version = "3.54.1";
+  version = "3.56.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "alacarte";
     rev = version;
-    hash = "sha256-nfSYbGZvx76UzHGf6Jxq8Ny5o9NX5nXG9Kc/gRNn6HM=";
+    hash = "sha256-sH/2ULI1QEqmgFIFFnOwsx2/+TMt+bPu0l0LUcnBgWg=";
   };
 
   format = "other";

From 8f72df78f3ad605c507196988f4773c192824907 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Mon, 28 Apr 2025 20:21:52 +0800
Subject: [PATCH 12/48] python3Packages.openusd: remove deprecated stub on
 darwin

---
 pkgs/development/python-modules/openusd/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix
index da2f0e13effe..a96a3acb5528 100644
--- a/pkgs/development/python-modules/openusd/default.nix
+++ b/pkgs/development/python-modules/openusd/default.nix
@@ -4,7 +4,6 @@
   boost,
   buildPythonPackage,
   cmake,
-  darwin,
   distutils,
   doxygen,
   draco,
@@ -142,7 +141,6 @@ buildPythonPackage rec {
       libX11
       libXt
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa ])
     ++ lib.optionals withOsl [ osl ]
     ++ lib.optionals withUsdView [ qt6.qtbase ]
     ++ lib.optionals (withUsdView && stdenv.hostPlatform.isLinux) [

From ea126f64abf4be5e9c86f5139babdca595e8cf88 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Mon, 28 Apr 2025 20:29:19 +0800
Subject: [PATCH 13/48] python3Packages.openusd: add `meta.changelog`, remove
 duplicate inputs

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

diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix
index a96a3acb5528..e5c2d2064893 100644
--- a/pkgs/development/python-modules/openusd/default.nix
+++ b/pkgs/development/python-modules/openusd/default.nix
@@ -143,10 +143,7 @@ buildPythonPackage rec {
     ]
     ++ lib.optionals withOsl [ osl ]
     ++ lib.optionals withUsdView [ qt6.qtbase ]
-    ++ lib.optionals (withUsdView && stdenv.hostPlatform.isLinux) [
-      qt6.qtbase
-      qt6.qtwayland
-    ];
+    ++ lib.optionals (withUsdView && stdenv.hostPlatform.isLinux) [ qt6.qtwayland ];
 
   propagatedBuildInputs =
     [
@@ -186,6 +183,7 @@ buildPythonPackage rec {
       for interchange between graphics applications.
     '';
     homepage = "https://openusd.org/";
+    changelog = "https://github.com/PixarAnimationStudios/OpenUSD/${src.tag}/CHANGELOG.md";
     license = lib.licenses.tost;
     maintainers = with lib.maintainers; [
       shaddydc

From 956f94252a7fff048583c109e3fd4b7885f8fa9f Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Mon, 28 Apr 2025 18:22:32 +0200
Subject: [PATCH 14/48] oxidized: 0.30.1 -> 0.33.0

---
 pkgs/by-name/ox/oxidized/Gemfile      | 13 ++---
 pkgs/by-name/ox/oxidized/Gemfile.lock | 63 +++++++++++++-----------
 pkgs/by-name/ox/oxidized/gemset.nix   | 71 ++++++++++++++++++++-------
 3 files changed, 92 insertions(+), 55 deletions(-)

diff --git a/pkgs/by-name/ox/oxidized/Gemfile b/pkgs/by-name/ox/oxidized/Gemfile
index 7a7d3f0fb2ac..6ce79a159835 100644
--- a/pkgs/by-name/ox/oxidized/Gemfile
+++ b/pkgs/by-name/ox/oxidized/Gemfile
@@ -1,11 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'oxidized', '0.30.1'
-gem 'oxidized-web', '0.14.0'
-
-# The version on rubygems is not up2date
-gem 'oxidized-script', git: 'https://github.com/ytti/oxidized-script.git', ref: '988cded5d89f52e274afb545bd3e011e19d5d22d'
-
-# Fix for https://github.com/ytti/oxidized/issues/2769
-gem 'psych', '~> 3.3.2'
-
+gem 'oxidized', '0.33.0'
+gem 'oxidized-web', '0.16.0'
+gem 'oxidized-script', '0.7.0'
+gem 'psych', '~> 5.0'
diff --git a/pkgs/by-name/ox/oxidized/Gemfile.lock b/pkgs/by-name/ox/oxidized/Gemfile.lock
index 660cf7cdb813..667fe8266d0d 100644
--- a/pkgs/by-name/ox/oxidized/Gemfile.lock
+++ b/pkgs/by-name/ox/oxidized/Gemfile.lock
@@ -1,18 +1,11 @@
-GIT
-  remote: https://github.com/ytti/oxidized-script.git
-  revision: 988cded5d89f52e274afb545bd3e011e19d5d22d
-  ref: 988cded5d89f52e274afb545bd3e011e19d5d22d
-  specs:
-    oxidized-script (0.6.0)
-      oxidized (~> 0.28)
-      slop (~> 4.6)
-
 GEM
   remote: https://rubygems.org/
   specs:
     asetus (0.4.0)
     base64 (0.2.0)
     bcrypt_pbkdf (1.1.1)
+    bcrypt_pbkdf (1.1.1-arm64-darwin)
+    bcrypt_pbkdf (1.1.1-x86_64-darwin)
     charlock_holmes (0.7.9)
     date (3.4.1)
     ed25519 (1.3.0)
@@ -23,7 +16,7 @@ GEM
       thor
       tilt
     htmlentities (4.3.4)
-    json (2.10.2)
+    json (2.11.3)
     logger (1.7.0)
     multi_json (1.15.0)
     mustermann (3.0.3)
@@ -31,6 +24,7 @@ GEM
     net-ftp (0.3.8)
       net-protocol
       time
+    net-http-digest_auth (1.4.1)
     net-protocol (0.2.2)
       timeout
     net-scp (4.1.0)
@@ -38,31 +32,40 @@ GEM
     net-ssh (7.3.0)
     net-telnet (0.2.0)
     nio4r (2.7.4)
-    oxidized (0.30.1)
-      asetus (~> 0.1)
+    ostruct (0.6.1)
+    oxidized (0.33.0)
+      asetus (~> 0.4)
       bcrypt_pbkdf (~> 1.0)
       ed25519 (~> 1.2)
       net-ftp (~> 0.2)
-      net-scp (~> 4.0)
-      net-ssh (~> 7.1)
+      net-http-digest_auth (~> 1.4)
+      net-scp (~> 4.1)
+      net-ssh (~> 7.3)
       net-telnet (~> 0.2)
-      psych (~> 3.3.2)
+      ostruct (~> 0.6)
+      psych (~> 5.0)
       rugged (~> 1.6)
       slop (~> 4.6)
-    oxidized-web (0.14.0)
+    oxidized-script (0.7.0)
+      oxidized (~> 0.29)
+      slop (~> 4.6)
+    oxidized-web (0.16.0)
       charlock_holmes (~> 0.7.5)
       emk-sinatra-url-for (~> 0.2)
       haml (~> 6.0)
       htmlentities (~> 4.3)
       json (~> 2.3)
-      oxidized (~> 0.26)
-      puma (>= 3.11.4, < 6.5.0)
-      sinatra (>= 1.4.6, < 5.0)
-      sinatra-contrib (>= 1.4.6, < 5.0)
-    psych (3.3.4)
-    puma (6.4.3)
+      ostruct (~> 0.6)
+      oxidized (~> 0.31)
+      puma (>= 3.11.4)
+      sinatra (>= 1.4.6)
+      sinatra-contrib (>= 1.4.6)
+    psych (5.2.3)
+      date
+      stringio
+    puma (6.6.0)
       nio4r (~> 2.0)
-    rack (3.1.12)
+    rack (3.1.13)
     rack-protection (4.1.1)
       base64 (>= 0.1.0)
       logger (>= 1.6.0)
@@ -86,6 +89,7 @@ GEM
       sinatra (= 4.1.1)
       tilt (~> 2.0)
     slop (4.10.1)
+    stringio (3.1.7)
     temple (0.10.3)
     thor (1.3.2)
     tilt (2.6.0)
@@ -94,13 +98,16 @@ GEM
     timeout (0.4.3)
 
 PLATFORMS
+  arm64-darwin
   ruby
+  x86_64-darwin
+  x86_64-linux
 
 DEPENDENCIES
-  oxidized (= 0.30.1)
-  oxidized-script!
-  oxidized-web (= 0.14.0)
-  psych (~> 3.3.2)
+  oxidized (= 0.33.0)
+  oxidized-script (= 0.7.0)
+  oxidized-web (= 0.16.0)
+  psych (~> 5.0)
 
 BUNDLED WITH
-   2.6.2
+   2.5.22
diff --git a/pkgs/by-name/ox/oxidized/gemset.nix b/pkgs/by-name/ox/oxidized/gemset.nix
index 3bbb47bc3d0c..c946d8773f98 100644
--- a/pkgs/by-name/ox/oxidized/gemset.nix
+++ b/pkgs/by-name/ox/oxidized/gemset.nix
@@ -100,10 +100,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l";
+      sha256 = "1hfcz73wszgqprg2pr83qjbyfb0k93frbdvyhgmw0ryyl9cgc44s";
       type = "gem";
     };
-    version = "2.10.2";
+    version = "2.11.3";
   };
   logger = {
     groups = [ "default" ];
@@ -150,6 +150,16 @@
     };
     version = "0.3.8";
   };
+  net-http-digest_auth = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1nq859b0gh2vjhvl1qh1zrk09pc7p54r9i6nnn6sb06iv07db2jb";
+      type = "gem";
+    };
+    version = "1.4.1";
+  };
   net-protocol = {
     dependencies = [ "timeout" ];
     groups = [ "default" ];
@@ -202,15 +212,27 @@
     };
     version = "2.7.4";
   };
+  ostruct = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9";
+      type = "gem";
+    };
+    version = "0.6.1";
+  };
   oxidized = {
     dependencies = [
       "asetus"
       "bcrypt_pbkdf"
       "ed25519"
       "net-ftp"
+      "net-http-digest_auth"
       "net-scp"
       "net-ssh"
       "net-telnet"
+      "ostruct"
       "psych"
       "rugged"
       "slop"
@@ -219,10 +241,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ry9rwksjb80wxd42zv5m5444n5hwhkbr4spa895jk2c1k5q1y0c";
+      sha256 = "02vprgsqaafrnkz9fhj27mv8ngir4h1g07zc6s6f7gja5awfwqzm";
       type = "gem";
     };
-    version = "0.30.1";
+    version = "0.33.0";
   };
   oxidized-script = {
     dependencies = [
@@ -232,13 +254,11 @@
     groups = [ "default" ];
     platforms = [ ];
     source = {
-      fetchSubmodules = false;
-      rev = "988cded5d89f52e274afb545bd3e011e19d5d22d";
-      sha256 = "13vglj6w37xd6dqfn98xdan3kqbs460akj1rdr4bm7lsrpa281gf";
-      type = "git";
-      url = "https://github.com/ytti/oxidized-script.git";
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0734py1wb97zgjlsdd9rfw60pm0pnp02a53z0va5w5ng7sjn2zli";
+      type = "gem";
     };
-    version = "0.6.0";
+    version = "0.7.0";
   };
   oxidized-web = {
     dependencies = [
@@ -247,6 +267,7 @@
       "haml"
       "htmlentities"
       "json"
+      "ostruct"
       "oxidized"
       "puma"
       "sinatra"
@@ -256,20 +277,24 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mf1kxjg49fxf988sqd9cni8j5r8xsp3218370ppinsy39l50782";
+      sha256 = "1w16ha8rdnqb9j7v9mjdgfh4p0fdmwfxfprs167267ag1mah4268";
       type = "gem";
     };
-    version = "0.14.0";
+    version = "0.16.0";
   };
   psych = {
+    dependencies = [
+      "date"
+      "stringio"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "186i2hc6sfvg4skhqf82kxaf4mb60g65fsif8w8vg1hc9mbyiaph";
+      sha256 = "1vjrx3yd596zzi42dcaq5xw7hil1921r769dlbz08iniaawlp9c4";
       type = "gem";
     };
-    version = "3.3.4";
+    version = "5.2.3";
   };
   puma = {
     dependencies = [ "nio4r" ];
@@ -277,20 +302,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0gml1rixrfb0naciq3mrnqkpcvm9ahgps1c04hzxh4b801f69914";
+      sha256 = "11xd3207k5rl6bz0qxhcb3zcr941rhx7ig2f19gxxmdk7s3hcp7j";
       type = "gem";
     };
-    version = "6.4.3";
+    version = "6.6.0";
   };
   rack = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0h65a1f9gsqx2ryisdy4lrd9a9l8gdv65dcscw9ynwwjr1ak1n00";
+      sha256 = "14jpch41i6iclbgc8rykvkyn7ii8s9dwvn98k96qi0hqcbdpj30p";
       type = "gem";
     };
-    version = "3.1.12";
+    version = "3.1.13";
   };
   rack-protection = {
     dependencies = [
@@ -386,6 +411,16 @@
     };
     version = "4.10.1";
   };
+  stringio = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1yh78pg6lm28c3k0pfd2ipskii1fsraq46m6zjs5yc9a4k5vfy2v";
+      type = "gem";
+    };
+    version = "3.1.7";
+  };
   temple = {
     groups = [ "default" ];
     platforms = [ ];

From fd85b6e1ea82633c14482e4f7983c8ad3eaad1dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 28 Apr 2025 19:59:56 +0000
Subject: [PATCH 15/48] nzbhydra2: 7.12.3 -> 7.13.0

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

diff --git a/pkgs/by-name/nz/nzbhydra2/package.nix b/pkgs/by-name/nz/nzbhydra2/package.nix
index 23c7cbf19ea9..1fa9cd840c55 100644
--- a/pkgs/by-name/nz/nzbhydra2/package.nix
+++ b/pkgs/by-name/nz/nzbhydra2/package.nix
@@ -10,11 +10,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "nzbhydra2";
-  version = "7.12.3";
+  version = "7.13.0";
 
   src = fetchzip {
     url = "https://github.com/theotherp/nzbhydra2/releases/download/v${version}/nzbhydra2-${version}-generic.zip";
-    hash = "sha256-uTtkMusIhDbD+CojOSJ59Kqo6iSuIqWLqd6T5tYuX4k=";
+    hash = "sha256-jMiSVzAulM7xs6Z3KYIFHjJHx8dWFVbr/PqNeItV81g=";
     stripRoot = false;
   };
 

From 5c24cbdf6ab6a1a542563668e55c88b1e376b817 Mon Sep 17 00:00:00 2001
From: eymeric <eymericdechelette@gmail.com>
Date: Tue, 15 Apr 2025 21:52:19 +0200
Subject: [PATCH 16/48] hyperhdr: 20.0.0.0 -> 21.0.0.0

---
 pkgs/by-name/hy/hyperhdr/package.nix | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hy/hyperhdr/package.nix b/pkgs/by-name/hy/hyperhdr/package.nix
index f6dafbde43d3..9648a5568621 100644
--- a/pkgs/by-name/hy/hyperhdr/package.nix
+++ b/pkgs/by-name/hy/hyperhdr/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   pkg-config,
   alsa-lib,
@@ -13,6 +14,7 @@
   qt6Packages,
   qmqtt,
   xz,
+  sdbus-cpp_2,
 }:
 
 let
@@ -23,13 +25,15 @@ in
 
 stdenv.mkDerivation rec {
   pname = "hyperhdr";
-  version = "20.0.0.0";
+  version = "21.0.0.0";
 
   src = fetchFromGitHub {
     owner = "awawa-dev";
     repo = "HyperHDR";
     tag = "v${version}";
-    hash = "sha256-agIWtDlMwjD0sGX2ntFwqROzUsl8tY3nRbmFvvOVh4o=";
+    hash = "sha256-S4in3fVjbkPfQe7ubuoUJ6AKha2luSjZPFS55aSo2jU=";
+    fetchSubmodules = true;
+    deepClone = true;
   };
 
   nativeBuildInputs = [
@@ -38,8 +42,19 @@ stdenv.mkDerivation rec {
     qt6Packages.wrapQtAppsHook
   ];
 
+  patches = [
+    # https://github.com/awawa-dev/HyperHDR/pull/1140
+    # This can be removed on next release
+    (fetchpatch {
+      name = "USE_SYSTEM_SDBUS_CPP_LIBS";
+      url = "https://github.com/awawa-dev/HyperHDR/pull/1140.patch";
+      hash = "sha256-Fuog++K3qaDeC/HymLPl5RF0yolNFL891EY4f36ILwE=";
+    })
+  ];
+
   cmakeFlags = [
     "-DPLATFORM=linux"
+    (cmakeBool "USE_SYSTEM_SDBUS_CPP_LIBS" true)
     (cmakeBool "USE_SYSTEM_MQTT_LIBS" true)
     (cmakeBool "USE_SYSTEM_FLATBUFFERS_LIBS" true)
     (cmakeBool "USE_SYSTEM_MBEDTLS_LIBS" true)
@@ -56,6 +71,7 @@ stdenv.mkDerivation rec {
     qt6Packages.qtbase
     qt6Packages.qtserialport
     xz
+    sdbus-cpp_2
   ];
 
   meta = with lib; {

From bb1f166d4892f28a7c2fa2c23591a48078b80d19 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sun, 27 Apr 2025 10:25:05 -0700
Subject: [PATCH 17/48] treewide: remove gtk = gtk*

---
 pkgs/applications/misc/devilspie2/default.nix |  4 +--
 pkgs/applications/misc/girara/default.nix     |  4 +--
 pkgs/applications/misc/swappy/default.nix     |  4 +--
 .../misc/zathura/core/default.nix             |  4 +--
 pkgs/applications/misc/zathura/default.nix    |  3 --
 .../misc/zathura/djvu/default.nix             |  4 +--
 .../networking/browsers/surf/default.nix      |  4 +--
 .../networking/ftp/gftp/default.nix           |  4 +--
 pkgs/applications/office/grisbi/default.nix   |  4 +--
 .../terminal-emulators/stupidterm/default.nix |  4 +--
 pkgs/desktops/rox/rox-filer/default.nix       |  4 +--
 .../libraries/gtk-mac-integration/default.nix |  3 +-
 pkgs/tools/X11/xbindkeys-config/default.nix   |  4 +--
 pkgs/tools/misc/gbdfed/default.nix            |  4 +--
 pkgs/top-level/all-packages.nix               | 34 ++++++-------------
 15 files changed, 36 insertions(+), 52 deletions(-)

diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix
index 8fc86ff3a3ba..a9d002d49331 100644
--- a/pkgs/applications/misc/devilspie2/default.nix
+++ b/pkgs/applications/misc/devilspie2/default.nix
@@ -5,7 +5,7 @@
   intltool,
   pkg-config,
   glib,
-  gtk,
+  gtk3,
   lua,
   libwnck,
 }:
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     glib
-    gtk
+    gtk3
     lua
     libwnck
   ];
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index 20c7b060a78e..a1fdd3de369d 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -9,7 +9,7 @@
   dbus,
   xvfb-run,
   glib,
-  gtk,
+  gtk3,
   gettext,
   libiconv,
   json-glib,
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [
     glib
-    gtk
+    gtk3
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/applications/misc/swappy/default.nix b/pkgs/applications/misc/swappy/default.nix
index 848e73ff2df3..91afa5de1f1b 100644
--- a/pkgs/applications/misc/swappy/default.nix
+++ b/pkgs/applications/misc/swappy/default.nix
@@ -7,7 +7,7 @@
   wayland,
   cairo,
   pango,
-  gtk,
+  gtk3,
   pkg-config,
   scdoc,
   libnotify,
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     cairo
     pango
-    gtk
+    gtk3
     libnotify
     wayland
     glib
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 899e1ee92fba..3ca3f6b8655a 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -11,7 +11,7 @@
   json-glib,
   desktop-file-utils,
   python3,
-  gtk,
+  gtk3,
   girara,
   gettext,
   gnome,
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs =
     [
-      gtk
+      gtk3
       girara
       libintl
       sqlite
diff --git a/pkgs/applications/misc/zathura/default.nix b/pkgs/applications/misc/zathura/default.nix
index 88241856632d..9290e079d480 100644
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@@ -3,7 +3,6 @@
   lib,
   stdenv,
   newScope,
-  gtk3,
   useMupdf ? true,
 }:
 
@@ -15,8 +14,6 @@ lib.makeScope newScope (
   {
     inherit useMupdf;
 
-    gtk = gtk3;
-
     zathura_core = callPackage ./core { };
 
     zathura_pdf_poppler = callPackage ./pdf-poppler { };
diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix
index 87ac40d1b204..70761922fc6b 100644
--- a/pkgs/applications/misc/zathura/djvu/default.nix
+++ b/pkgs/applications/misc/zathura/djvu/default.nix
@@ -5,7 +5,7 @@
   meson,
   ninja,
   pkg-config,
-  gtk,
+  gtk3,
   zathura_core,
   girara,
   djvulibre,
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     djvulibre
     gettext
     zathura_core
-    gtk
+    gtk3
     girara
   ];
 
diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix
index 2e8e52b3efe4..8a38ab27a506 100644
--- a/pkgs/applications/networking/browsers/surf/default.nix
+++ b/pkgs/applications/networking/browsers/surf/default.nix
@@ -8,7 +8,7 @@
   gcr,
   glib-networking,
   gsettings-desktop-schemas,
-  gtk,
+  gtk2,
   libsoup_2_4,
   webkitgtk_4_0,
   xorg,
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
       gcr
       glib-networking
       gsettings-desktop-schemas
-      gtk
+      gtk2
       libsoup_2_4
       webkitgtk_4_0
     ]
diff --git a/pkgs/applications/networking/ftp/gftp/default.nix b/pkgs/applications/networking/ftp/gftp/default.nix
index 361abf88c2d8..9f6a1f4fb2f8 100644
--- a/pkgs/applications/networking/ftp/gftp/default.nix
+++ b/pkgs/applications/networking/ftp/gftp/default.nix
@@ -5,7 +5,7 @@
   autoconf,
   automake,
   gettext,
-  gtk,
+  gtk2,
   intltool,
   libtool,
   ncurses,
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    gtk
+    gtk2
     ncurses
     openssl
     readline
diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix
index e28b7614b7f1..b58bdc620c46 100644
--- a/pkgs/applications/office/grisbi/default.nix
+++ b/pkgs/applications/office/grisbi/default.nix
@@ -2,7 +2,7 @@
   fetchFromGitHub,
   lib,
   stdenv,
-  gtk,
+  gtk3,
   pkg-config,
   libgsf,
   libofx,
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    gtk
+    gtk3
     libgsf
     libofx
     adwaita-icon-theme
diff --git a/pkgs/applications/terminal-emulators/stupidterm/default.nix b/pkgs/applications/terminal-emulators/stupidterm/default.nix
index 379bd1d94278..7d82681b92df 100644
--- a/pkgs/applications/terminal-emulators/stupidterm/default.nix
+++ b/pkgs/applications/terminal-emulators/stupidterm/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   pkg-config,
   vte,
-  gtk,
+  gtk3,
   pcre2,
   nixosTests,
 }:
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     vte
-    gtk
+    gtk3
     pcre2
   ];
 
diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix
index cffa6eca1bf7..841e70157316 100644
--- a/pkgs/desktops/rox/rox-filer/default.nix
+++ b/pkgs/desktops/rox/rox-filer/default.nix
@@ -6,7 +6,7 @@
   pkg-config,
   wrapGAppsHook3,
   libxml2,
-  gtk,
+  gtk2,
   libSM,
   shared-mime-info,
 }:
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     libxml2
-    gtk
+    gtk2
     shared-mime-info
     libSM
   ];
diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix
index 383fab6b5f68..d2d56bec0da0 100644
--- a/pkgs/development/libraries/gtk-mac-integration/default.nix
+++ b/pkgs/development/libraries/gtk-mac-integration/default.nix
@@ -6,7 +6,8 @@
   pkg-config,
   glib,
   gtk-doc,
-  gtk,
+  gtk ? gtk3,
+  gtk3,
   gobject-introspection,
 }:
 
diff --git a/pkgs/tools/X11/xbindkeys-config/default.nix b/pkgs/tools/X11/xbindkeys-config/default.nix
index 660c1e2c8843..3a0bb35223cf 100644
--- a/pkgs/tools/X11/xbindkeys-config/default.nix
+++ b/pkgs/tools/X11/xbindkeys-config/default.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  gtk,
+  gtk2,
   pkg-config,
   procps,
   makeWrapper,
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     pkg-config
     makeWrapper
   ];
-  buildInputs = [ gtk ];
+  buildInputs = [ gtk2 ];
 
   src = fetchurl {
     url = "mirror://debian/pool/main/x/xbindkeys-config/xbindkeys-config_${version}.orig.tar.gz";
diff --git a/pkgs/tools/misc/gbdfed/default.nix b/pkgs/tools/misc/gbdfed/default.nix
index 1d72d2c05f44..71e89cf5b38f 100644
--- a/pkgs/tools/misc/gbdfed/default.nix
+++ b/pkgs/tools/misc/gbdfed/default.nix
@@ -4,7 +4,7 @@
   fetchurl,
   pkg-config,
   freetype,
-  gtk,
+  gtk2-x11,
 }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     freetype
-    gtk
+    gtk2-x11
   ];
 
   patches = [ ./Makefile.patch ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d754bf7bb9b2..49194b7cd223 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1644,9 +1644,7 @@ with pkgs;
   xst = callPackage ../applications/terminal-emulators/st/xst.nix { };
   mcaimi-st = callPackage ../applications/terminal-emulators/st/mcaimi-st.nix { };
 
-  stupidterm = callPackage ../applications/terminal-emulators/stupidterm {
-    gtk = gtk3;
-  };
+  stupidterm = callPackage ../applications/terminal-emulators/stupidterm { };
 
   termite = callPackage ../applications/terminal-emulators/termite/wrapper.nix {
     termite = termite-unwrapped;
@@ -2684,7 +2682,7 @@ with pkgs;
 
   steampipePackages = recurseIntoAttrs (callPackage ../tools/misc/steampipe-packages { });
 
-  swappy = callPackage ../applications/misc/swappy { gtk = gtk3; };
+  swappy = callPackage ../applications/misc/swappy { };
 
   synth = callPackage ../tools/misc/synth {
     inherit (darwin.apple_sdk.frameworks) AppKit Security;
@@ -3132,9 +3130,7 @@ with pkgs;
 
   dconf2nix = callPackage ../development/tools/haskell/dconf2nix { };
 
-  devilspie2 = callPackage ../applications/misc/devilspie2 {
-    gtk = gtk3;
-  };
+  devilspie2 = callPackage ../applications/misc/devilspie2 { };
 
   ddcui = libsForQt5.callPackage ../applications/misc/ddcui { };
 
@@ -3484,13 +3480,9 @@ with pkgs;
 
   gawkInteractive = gawk.override { interactive = true; };
 
-  gbdfed = callPackage ../tools/misc/gbdfed {
-    gtk = gtk2-x11;
-  };
+  gbdfed = callPackage ../tools/misc/gbdfed { };
 
-  gftp = callPackage ../applications/networking/ftp/gftp {
-    gtk = gtk2;
-  };
+  gftp = callPackage ../applications/networking/ftp/gftp { };
 
   ggshield = callPackage ../tools/security/ggshield {
     python3 = python311;
@@ -9603,9 +9595,7 @@ with pkgs;
 
   gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { };
 
-  gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration {
-    gtk = gtk3;
-  };
+  gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration { };
 
   gtk-mac-integration-gtk2 = gtk-mac-integration.override {
     gtk = gtk2;
@@ -14325,9 +14315,7 @@ with pkgs;
 
   gimpPlugins = recurseIntoAttrs (callPackage ../applications/graphics/gimp/plugins { });
 
-  girara = callPackage ../applications/misc/girara {
-    gtk = gtk3;
-  };
+  girara = callPackage ../applications/misc/girara { };
 
   gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; };
 
@@ -14406,7 +14394,7 @@ with pkgs;
   graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; };
   graphicsmagick-imagemagick-compat = graphicsmagick.imagemagick-compat;
 
-  grisbi = callPackage ../applications/office/grisbi { gtk = gtk3; };
+  grisbi = callPackage ../applications/office/grisbi { };
 
   q4wine = libsForQt5.callPackage ../applications/misc/q4wine { };
 
@@ -16000,7 +15988,7 @@ with pkgs;
     pythonBindings = true;
   };
 
-  surf = callPackage ../applications/networking/browsers/surf { gtk = gtk2; };
+  surf = callPackage ../applications/networking/browsers/surf { };
 
   surge = callPackage ../applications/audio/surge {
     git = gitMinimal;
@@ -17587,9 +17575,7 @@ with pkgs;
   # Needed for elementary's gala, wingpanel and greeter until support for higher versions is provided
   pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { });
 
-  rox-filer = callPackage ../desktops/rox/rox-filer {
-    gtk = gtk2;
-  };
+  rox-filer = callPackage ../desktops/rox/rox-filer { };
 
   xfce = recurseIntoAttrs (callPackage ../desktops/xfce { });
 

From e7b96066b7f73e742c1d706a8dbffd90c0d019c9 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Mon, 28 Apr 2025 18:06:44 -0700
Subject: [PATCH 18/48] pxlib: drop

---
 pkgs/by-name/px/pxlib/package.nix | 25 -------------------------
 pkgs/top-level/aliases.nix        |  1 +
 2 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 pkgs/by-name/px/pxlib/package.nix

diff --git a/pkgs/by-name/px/pxlib/package.nix b/pkgs/by-name/px/pxlib/package.nix
deleted file mode 100644
index b0ac6d42e7fe..000000000000
--- a/pkgs/by-name/px/pxlib/package.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  intltool,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "pxlib";
-  version = "0.6.8";
-  src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "1yafwz4z5h30hqvk51wpgbjlmq9f2z2znvfim87ydrfrqfjmi6sz";
-  };
-
-  nativeBuildInputs = [ intltool ];
-
-  meta = with lib; {
-    description = "Library to read and write Paradox files";
-    homepage = "https://pxlib.sourceforge.net/";
-    license = licenses.gpl2;
-    platforms = platforms.all;
-    maintainers = [ maintainers.winpat ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4092bcd1c6aa..c4052cd26e28 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1509,6 +1509,7 @@ mapAliases {
   proxmark3-rrg = proxmark3; # Added 2023-07-25
   psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14
   pwndbg = throw "'pwndbg' has been removed due to dependency version incompatibilities that are infeasible to maintain in nixpkgs. Use the downstream flake that pwndbg provides instead: https://github.com/pwndbg/pwndbg"; # Added 2025-02-09
+  pxlib = throw "pxlib has been removed due to failing to build and lack of upstream maintenance"; # Added 2025-04-28
   pynac = throw "'pynac' has been removed as it was broken and unmaintained"; # Added 2025-03-18
   pyo3-pack = maturin;
   pypi2nix = throw "pypi2nix has been removed due to being unmaintained";

From 8fe68a9e8dfd5f9076404c0a550e1e8343caa68b Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Mon, 28 Apr 2025 18:02:21 -0700
Subject: [PATCH 19/48] neocomp: drop

---
 pkgs/by-name/ne/neocomp/package.nix | 94 -----------------------------
 pkgs/top-level/aliases.nix          |  1 +
 2 files changed, 1 insertion(+), 94 deletions(-)
 delete mode 100644 pkgs/by-name/ne/neocomp/package.nix

diff --git a/pkgs/by-name/ne/neocomp/package.nix b/pkgs/by-name/ne/neocomp/package.nix
deleted file mode 100644
index 31e7d7de8ec9..000000000000
--- a/pkgs/by-name/ne/neocomp/package.nix
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  asciidoc,
-  docbook_xml_dtd_45,
-  docbook_xsl,
-  freetype,
-  judy,
-  libGL,
-  libconfig,
-  libdrm,
-  libxml2,
-  libxslt,
-  libXcomposite,
-  libXdamage,
-  libXext,
-  libXinerama,
-  libXrandr,
-  libXrender,
-  libXres,
-  pcre,
-  pkg-config,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "neocomp";
-  version = "unstable-2021-04-06";
-
-  src = fetchFromGitHub {
-    owner = "DelusionalLogic";
-    repo = "NeoComp";
-    rev = "ccd340d7b2dcd3f828aff958a638cc23686aee6f";
-    sha256 = "sha256-tLLEwpAGNVTC+N41bM7pfskIli4Yvc95wH2/NT0OZ+8=";
-  };
-
-  nativeBuildInputs = [
-    asciidoc
-    docbook_xml_dtd_45
-    docbook_xsl
-    pkg-config
-  ];
-
-  buildInputs = [
-    freetype
-    judy
-    libGL
-    libconfig
-    libdrm
-    libxml2
-    libxslt
-    libXcomposite
-    libXdamage
-    libXext
-    libXinerama
-    libXrandr
-    libXrender
-    libXres
-    pcre
-  ];
-
-  makeFlags = [
-    "PREFIX=${placeholder "out"}"
-    "CFGDIR=${placeholder "out"}/etc/xdg/neocomp"
-    "ASTDIR=${placeholder "out"}/share/neocomp/assets"
-    "COMPTON_VERSION=${version}"
-  ];
-
-  postPatch = ''
-    substituteInPlace src/compton.c --replace \
-      "assets_add_path(\"./assets/\");" \
-      "assets_add_path(\"$out/share/neocomp/assets/\");"
-    substituteInPlace src/assets/assets.c --replace \
-      "#define MAX_PATH_LENGTH 64" \
-      "#define MAX_PATH_LENGTH 128"
-  '';
-
-  meta = with lib; {
-    homepage = "https://github.com/DelusionalLogic/NeoComp";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
-      twey
-      moni
-    ];
-    platforms = platforms.linux;
-    description = "Fork of Compton, a compositor for X11";
-    longDescription = ''
-      NeoComp is a (hopefully) fast and (hopefully) simple compositor
-      for X11, focused on delivering frames from the window to the
-      framebuffer as quickly as possible.
-    '';
-    mainProgram = "neocomp";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4092bcd1c6aa..cbdac0d37177 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1211,6 +1211,7 @@ mapAliases {
 
   ncdu_2 = ncdu; # Added 2022-07-22
   neocities-cli = neocities; # Added 2024-07-31
+  neocomp = throw "neocomp has been remove because it fails to build and was unmaintained upstream"; # Added 2025-04-28
   netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02
   netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22
   nextcloud29 = throw ''

From 1cd76fbdd194fd465ec2f77e96b8a237dc0ba5a6 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Mon, 28 Apr 2025 18:11:56 -0700
Subject: [PATCH 20/48] pxview: drop

---
 pkgs/by-name/px/pxview/package.nix | 39 ------------------------------
 pkgs/top-level/aliases.nix         |  1 +
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 pkgs/by-name/px/pxview/package.nix

diff --git a/pkgs/by-name/px/pxview/package.nix b/pkgs/by-name/px/pxview/package.nix
deleted file mode 100644
index ea3542adc879..000000000000
--- a/pkgs/by-name/px/pxview/package.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  pkg-config,
-  perl,
-  perlPackages,
-  pxlib,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "pxview";
-  version = "0.2.5";
-  src = fetchurl {
-    url = "mirror://sourceforge/pxlib/${pname}_${version}.orig.tar.gz";
-    sha256 = "1kpdqs6lvnyj02v9fbz1s427yqhgrxp7zw63rzfgiwd4iqp75139";
-  };
-
-  buildInputs = [
-    pxlib
-    perl
-  ] ++ (with perlPackages; [ libxml_perl ]);
-  nativeBuildInputs = [ pkg-config ];
-
-  configureFlags = [ "--with-pxlib=${pxlib.out}" ];
-
-  # https://sourceforge.net/p/pxlib/bugs/12/
-  LDFLAGS = "-lm";
-  hardeningDisable = [ "format" ];
-
-  meta = with lib; {
-    description = "Program to convert Paradox databases";
-    mainProgram = "pxview";
-    homepage = "https://pxlib.sourceforge.net/pxview/";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.winpat ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c4052cd26e28..2c67b0eb3373 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1510,6 +1510,7 @@ mapAliases {
   psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14
   pwndbg = throw "'pwndbg' has been removed due to dependency version incompatibilities that are infeasible to maintain in nixpkgs. Use the downstream flake that pwndbg provides instead: https://github.com/pwndbg/pwndbg"; # Added 2025-02-09
   pxlib = throw "pxlib has been removed due to failing to build and lack of upstream maintenance"; # Added 2025-04-28
+  pxview = throw "pxview has been removed due to failing to build and lack of upstream maintenance"; # Added 2025-04-28
   pynac = throw "'pynac' has been removed as it was broken and unmaintained"; # Added 2025-03-18
   pyo3-pack = maturin;
   pypi2nix = throw "pypi2nix has been removed due to being unmaintained";

From 8deb5284980ebd04d828afa2f29824839189bd42 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 29 Apr 2025 03:13:55 +0200
Subject: [PATCH 21/48] python313Packages.djangorestframework: 3.15.2 -> 3.16.0

https://github.com/encode/django-rest-framework/releases/tag/3.15.1
---
 .../python-modules/djangorestframework/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix
index 43a5c0779801..294c729d0bf7 100644
--- a/pkgs/development/python-modules/djangorestframework/default.nix
+++ b/pkgs/development/python-modules/djangorestframework/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "djangorestframework";
-  version = "3.15.2";
+  version = "3.16.0";
   pyproject = true;
   disabled = pythonOlder "3.6";
 
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "encode";
     repo = "django-rest-framework";
     rev = version;
-    hash = "sha256-ne0sk4m11Ha77tNmCsdhj7QVmCkYj5GjLn/dLF4qxU8=";
+    hash = "sha256-LFq8mUx+jAFFnQTfysYs+DSN941p+8h9mDDOp+LO7VU=";
   };
 
   build-system = [ setuptools ];

From 76e2d0061493b2869d0a9facb27bc89fc98b5796 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 29 Apr 2025 03:14:46 +0200
Subject: [PATCH 22/48] python313Packages.django-otp: 1.5.4 -> 1.6.0

https://github.com/django-otp/django-otp/blob/v1.6.0/CHANGES.rst
---
 pkgs/development/python-modules/django-otp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-otp/default.nix b/pkgs/development/python-modules/django-otp/default.nix
index d58ddda9abdc..bac8bab32a75 100644
--- a/pkgs/development/python-modules/django-otp/default.nix
+++ b/pkgs/development/python-modules/django-otp/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "django-otp";
-  version = "1.5.4";
+  version = "1.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "django-otp";
     repo = "django-otp";
     tag = "v${version}";
-    hash = "sha256-Hwi0Z5/e91peGbp+GvL/gCtUI4hcJ4kevJMWe9sFvYk=";
+    hash = "sha256-kK7aU2W89557vrzJF6XtmItIZlOsxibciyMlbRDT93c=";
   };
 
   build-system = [ hatchling ];

From 3b1ce66257345adb324d5b24d225e73520157fb8 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Tue, 29 Apr 2025 09:19:29 +0800
Subject: [PATCH 23/48] python3Packages.openusd: 24.11 -> 25.02a

---
 .../python-modules/openusd/default.nix          | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/openusd/default.nix b/pkgs/development/python-modules/openusd/default.nix
index e5c2d2064893..f359e88ad818 100644
--- a/pkgs/development/python-modules/openusd/default.nix
+++ b/pkgs/development/python-modules/openusd/default.nix
@@ -51,14 +51,14 @@ in
 
 buildPythonPackage rec {
   pname = "openusd";
-  version = "24.11";
+  version = "25.02a";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "PixarAnimationStudios";
     repo = "OpenUSD";
     tag = "v${version}";
-    hash = "sha256-ugTb28DAn8D3URxCyGeptf7F3YpL7bX4++lyVN+apas=";
+    hash = "sha256-QFwG6kOLM+R+QIAozk/Dbldj8LRt9kCJv0W/EGHkq6Q=";
   };
 
   stdenv = python.stdenv;
@@ -72,19 +72,6 @@ buildPythonPackage rec {
       url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/a07a6b4d1da19bfc499db49641d74fb7c1a71e9b.patch?full_index=1";
       hash = "sha256-Gww6Ll2nKwpcxMY9lnf5BZ3eqUWz1rik9P3mPKDOf+Y=";
     })
-    # https://github.com/PixarAnimationStudios/OpenUSD/issues/3442
-    # https://github.com/PixarAnimationStudios/OpenUSD/pull/3434 commit 1
-    (fetchpatch {
-      name = "explicitly-adding-template-keyword.patch";
-      url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/274cf7c6fe1c121d095acd38dd1a33214e0c8448.patch?full_index=1";
-      hash = "sha256-nlw7o2jVWV9f1Lzl32UXcRVXcWnfyMNv9Mp4SVgFvyw=";
-    })
-    # https://github.com/PixarAnimationStudios/OpenUSD/pull/3434 commit 2
-    (fetchpatch {
-      name = "fix-removes-unused-path.patch";
-      url = "https://github.com/PixarAnimationStudios/OpenUSD/commit/5a6437e44269534bfde0c35cc2c7bdef087b70e8.patch?full_index=1";
-      hash = "sha256-X2v14U0pJjd4IMD8viXK2/onVFqUabJTXwDGRFKDZ+g=";
-    })
   ];
 
   env.OSL_LOCATION = "${osl}";

From 0d6cca15d121ba8d1a08b3e51fe27fda3a443d4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Apr 2025 01:19:30 +0000
Subject: [PATCH 24/48] iosevka-bin: 33.2.1 -> 33.2.2

---
 pkgs/by-name/io/iosevka-bin/package.nix  |   2 +-
 pkgs/by-name/io/iosevka-bin/variants.nix | 180 +++++++++++------------
 2 files changed, 91 insertions(+), 91 deletions(-)

diff --git a/pkgs/by-name/io/iosevka-bin/package.nix b/pkgs/by-name/io/iosevka-bin/package.nix
index 4cc8c09d8636..d237b16d5b30 100644
--- a/pkgs/by-name/io/iosevka-bin/package.nix
+++ b/pkgs/by-name/io/iosevka-bin/package.nix
@@ -17,7 +17,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "${name}-bin";
-  version = "33.2.1";
+  version = "33.2.2";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip";
diff --git a/pkgs/by-name/io/iosevka-bin/variants.nix b/pkgs/by-name/io/iosevka-bin/variants.nix
index 7a44954f92fc..86ab7a0f219c 100644
--- a/pkgs/by-name/io/iosevka-bin/variants.nix
+++ b/pkgs/by-name/io/iosevka-bin/variants.nix
@@ -1,93 +1,93 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  Iosevka = "08z48033g3px5ybh5idcc8i9sgkaqphm2246ncrh4g7bwap4gm3p";
-  IosevkaAile = "10hc78wsqd7ijglsiml1mpcn3c8g0hf9j1hbz6k51rz8ql4iq12b";
-  IosevkaCurly = "13hdcvg51wlpxqjxzgf055gxfdqlw7ly2x9fajqiqwxfg6haq701";
-  IosevkaCurlySlab = "172g677kr092v1a86yv1nbnifdmvhk824fqwqyr9q8zv8yibq4pd";
-  IosevkaEtoile = "0ckz3qs9alf3r9xzq3l2pgdf86y8bckpyqbl8f37mwdqqk177y8l";
-  IosevkaSlab = "0sqwsgn8p1fympsm4ah27ghckxafddiqia8wibc54908jb84j6n2";
-  IosevkaSS01 = "1lsymss2scp7y8hdbwgzzqxi03wdmfikphfz0b2hjwbzqsv3198i";
-  IosevkaSS02 = "1fhiiwnmb7l2cw7rvmk65zn3x2g665p2hwl4mxmnbj94m0h1nyki";
-  IosevkaSS03 = "0vsrj557mzn21gdw1nrmrxl4r8q6rf3w7h1z104vxzp0zqn15hz6";
-  IosevkaSS04 = "114gzjjg00lagmq2lhdkjjgzsa2a9jc8v7mw0ayjc4gadjdvr3qv";
-  IosevkaSS05 = "1gw2wdxw4yz825aqi50p14bz7iz7i1d7nph1vz58ii52nnkygivq";
-  IosevkaSS06 = "0j5fz5vyg3b9c9aybrizncxdmh76yk2k6f430znqx6dd692i3irq";
-  IosevkaSS07 = "1qd28dp96xjqsz35b4fqxgiq2g797vpfv9zjvd1r1xcgsaliin5p";
-  IosevkaSS08 = "19n75kan3xggx3xvf0i978j058wzjd62bbyx36vyyjki104wkphk";
-  IosevkaSS09 = "0fidll4cqfwral0babkh3zb0kb9fi5nahax4cy395hbd2db4frzy";
-  IosevkaSS10 = "04nagrfnw0is75g0bh9pk046y6vh5b236d6mgfjxvv93zvqxdvyy";
-  IosevkaSS11 = "1ni71hx8pi9vyrg7imkym25g1pnx4fig525vkxp6mxzv63g50c43";
-  IosevkaSS12 = "1afhf8gvb7j0qlw87ps7rwaq2j39f199ghaif6qlh84wrahbmvr0";
-  IosevkaSS13 = "0byc54mpm28qcyzjryasyr6xm3nsqcc460caa9vmr0aajjmjqrva";
-  IosevkaSS14 = "0vlaa0zpb9myxnxrzwmr1sh99yypiiv94dabhyh5qwr8n8dz90qw";
-  IosevkaSS15 = "0q0jymy8brda65lliyfyfphw68s0zdh3c5vha1n0qgx26giq6cfx";
-  IosevkaSS16 = "0xdfagax1jaigxhk4n58r5wplpqgv9n4592g8rz09y9fnx16j42f";
-  IosevkaSS17 = "10yj4flqci2y7mbsjfm5zib7fa0jkxjsv4bjdh07bsgf0z1c5v4i";
-  IosevkaSS18 = "1j97gc101al6nqwrb2n896r1m29g9x9138fy9f7607mxd9l6m4y0";
-  SGr-Iosevka = "1rxmirx3xys75nmj76vdb6kh7m8awx8js9amm3cx9zwgn3rsibbm";
-  SGr-IosevkaCurly = "0sjqgnsbmmlb9g65z4zdfp57qbidmidzqvfal2szbydqp2kfpm8x";
-  SGr-IosevkaCurlySlab = "1yqy4fmfk8jbn98gqbg8q2iihlnzy590h4cyc3ap03npki9z737z";
-  SGr-IosevkaFixed = "1jw3w3nxbcbkqa2shskfjnh173zwj0n7qn1cl4dh5x4fpbpd8q1v";
-  SGr-IosevkaFixedCurly = "0pq0hyw1v687i1kwjzadwfbr9k6i07jyvg276h9mjsw6nc3x1lzm";
-  SGr-IosevkaFixedCurlySlab = "12bz84pm0cm37h99c67qw3ajqnfw894xx7jpzc6mygblcqv5ll6h";
-  SGr-IosevkaFixedSlab = "1cn9bndrcf1iv6jhry9wd850arb94dypm1zhv352vcq87vqawnyw";
-  SGr-IosevkaFixedSS01 = "1dgr2a94xhzcqsvcnpixdwvlm70nmxzpflr4m5c824g36n8xvvj3";
-  SGr-IosevkaFixedSS02 = "0vzfiq0wm6xf9alkarn2yyrdwjcxrr3z4ckskxl297pbpl3brr04";
-  SGr-IosevkaFixedSS03 = "1jbjmwx3l9h0978f319p4vkcm7bj9kmynywjvwgdfjwja5xl3mni";
-  SGr-IosevkaFixedSS04 = "0yiihs1l257bq9mxk6mmkldh5jipzc5nlh7v833pzw5b04i8lppl";
-  SGr-IosevkaFixedSS05 = "0n5v1yqgbydi51gf68d1w22vcp12annfialrj7w5azwszbgqps7k";
-  SGr-IosevkaFixedSS06 = "07lg26m4nbx02q1bfp7jg19pa2rvchpniay1wi3y064xw2xknzyb";
-  SGr-IosevkaFixedSS07 = "0pfbfifibcp5s7q8p4a17y6d5xp233ycba3n50qw3h0caml4qbnv";
-  SGr-IosevkaFixedSS08 = "18pc0fqx0zdqp2b3wxznx0c7qsa3b1fg9pfp90yc8984zfnfi0g7";
-  SGr-IosevkaFixedSS09 = "0mjyhjdif1a6mmh0swjczqmq4422ahpdpf5ivkpkd1dphcnpw5p5";
-  SGr-IosevkaFixedSS10 = "12m4c567cl869myhcbssy9xbigghvhylps3p76152hx0dvlaf7g5";
-  SGr-IosevkaFixedSS11 = "09q39nrzhcd1248nadv8cpqffkbzz2c4wcrq3pzfhxgsd3rl1asf";
-  SGr-IosevkaFixedSS12 = "1bj4j5zkyifsn0fgpb5ngixc2xii2rj9yglahy1hanxj5wd7i2ac";
-  SGr-IosevkaFixedSS13 = "1r0d62hka8jgkaasy4vagy0fvigfj7ffmjggqzsyrxma8lqhq73q";
-  SGr-IosevkaFixedSS14 = "1g1xyxs3lzzk1gj0qjv9gviklcs5psc19wrgklik6gd979rw1nzk";
-  SGr-IosevkaFixedSS15 = "0spga64nmnsbcrzvx7fqffbaxgps62qk90ap7ziqfbpvjmv1z7ig";
-  SGr-IosevkaFixedSS16 = "0yavrjd0b356kh32w4h022rrmk5cjs9zd7ibxfw8v4jzs0kyfcjy";
-  SGr-IosevkaFixedSS17 = "0aysk3lqvrrgng5sd0g40xsbkd74bqxksnm4mw4zngnp6mf59vvf";
-  SGr-IosevkaFixedSS18 = "0xd7d4j37xd2s2yhjc36fj6908s2zfl02cbn5yg2r8l02k4axi9v";
-  SGr-IosevkaSlab = "1y9xk9pyy16n239gn3l6355w5vmkb7chml3f7bhj4ad2ksiifvqx";
-  SGr-IosevkaSS01 = "1wz1vh7bqq1rwb7lgcb3864d7y5y1kf17hg83zg6061hdxfdsmhl";
-  SGr-IosevkaSS02 = "090idw6d1vqycs9gv6c3ajsgkk4wf66rag8gry9pcr54q9m5lym5";
-  SGr-IosevkaSS03 = "1p3q9gvx453506lrjcarvsqwqdbwgcdcrzq63p9gk2gm1n5kff85";
-  SGr-IosevkaSS04 = "1i22r2xkzj7271lhzaz2054nm5h6bdrz0jyagj93g2jdmqalfcpr";
-  SGr-IosevkaSS05 = "1qkxnj5wa2n9vk4v7ygyb4mrs52r1nh0847md42cj23ra5ym52xl";
-  SGr-IosevkaSS06 = "11mdlppqls83lrm2008bqzi1vmif6ficxby3p4ali61cv4w7svzx";
-  SGr-IosevkaSS07 = "1h7m4amjxhvhas3c7hxilfl8njn0i7d5rz6qczfwfd39v08iz5xy";
-  SGr-IosevkaSS08 = "1nq2c3a1s5lm1x4rx6xxpmxxkvvsg8rl2d98lriv80zhgs0lm4r8";
-  SGr-IosevkaSS09 = "1a90gi3gdfcid5kdrmyr0f7b5vg4akqmndxzrycrfbagbjdbi1v6";
-  SGr-IosevkaSS10 = "1ingh71nf7wkkgv4l6z4rbc43w4ca18x4ncr4f1jcyfliqqbf16k";
-  SGr-IosevkaSS11 = "0kgw3syf5ssym2hzz4xhg9dm078p6n1cj917bnvcymclam4b6c22";
-  SGr-IosevkaSS12 = "05vyx3fz0c9rrb4jfh194zw4bi8pafib6aa7cmiz1f6hz1vbacy5";
-  SGr-IosevkaSS13 = "0d6y1hjbnr30amcpakrwlmajcab1jlm3r5n7hhrc8d5jz35hqaa8";
-  SGr-IosevkaSS14 = "1l88ipygz2agjcqn44j1i5gnmqjrh793mwan67ilp1z5lgnzhw16";
-  SGr-IosevkaSS15 = "0j1svlf5c62bjhax31l9v2cn4qr5vx7hqpn8znv6035zdahilsqq";
-  SGr-IosevkaSS16 = "0q5dxd5zn75lfsxnvs219ii4nhc9gb6qaf42anzvqh7gq735kavh";
-  SGr-IosevkaSS17 = "0400s8yww3f98p797pppb4i3przdimbn432zah7dk5sgb0ywx95x";
-  SGr-IosevkaSS18 = "1ipbn79y1s095yqcji4wcysshnm1gkacb0xc5qh3lvsw8j2cr0v1";
-  SGr-IosevkaTerm = "1rqydb9y3nv8sb3vw874kr2f2lzphm1q7p1nlvv5sbwcd6fp53kf";
-  SGr-IosevkaTermCurly = "0gb5cxj0lhpi8mlsicfs3g9zzngfia0ggcmydv7c203bnza4d4ml";
-  SGr-IosevkaTermCurlySlab = "18anf1rzxgjc7df9jfr3pv0lxn6r7dn369lydqjlycpqjsfbfm30";
-  SGr-IosevkaTermSlab = "1fb1prmbdddh2jlsjnjw1gszxhccfp3bwjpzzs6b882bkryg8rmz";
-  SGr-IosevkaTermSS01 = "17y2bscaq7fjmy5cvwqycsmkzc5q0mp7lb99n2xrp9mrgf4yhqs0";
-  SGr-IosevkaTermSS02 = "126lpqnsx78i78nqi4l3n2va6588h8aw2ka7c2flj85vr29yisys";
-  SGr-IosevkaTermSS03 = "1wa8xl2m50kml1xj1yw29c3i6yzipqxcsryhi0k509cc9sxgnka7";
-  SGr-IosevkaTermSS04 = "0wfbi0hay0wrkrsa1v7hdy1l64mp5ipfpsl53jgf31panys7c683";
-  SGr-IosevkaTermSS05 = "0jk6cjlada8jxp68q05baw1f04waq5gmi01mipdrnvbw9kc30hyr";
-  SGr-IosevkaTermSS06 = "08jryrlih6kfnjj568i6imkrla1rgjmjr9wal16fng3gzfm8xq3p";
-  SGr-IosevkaTermSS07 = "0jiddj4qwrisq4v597dhvk15bkgiwx22ym64h2s5mkfqi7ddmfg3";
-  SGr-IosevkaTermSS08 = "0gjr3fd1cw78svlcdlq2dv8zzqrqijl57i51yll6g44vycfbfhh9";
-  SGr-IosevkaTermSS09 = "11x29agzb8s3a327zw6sb8sr1qkigc9psi4kinbmqzaxv86qgmx4";
-  SGr-IosevkaTermSS10 = "12x00b7fgci8jikayzhsf1p2qc0mrkff9n1rcq3xbwk03n0dykrn";
-  SGr-IosevkaTermSS11 = "0x836r4ham7ymlmpzxyk3bf3gb11rg40fdlin4liv4dj8mq2l8vb";
-  SGr-IosevkaTermSS12 = "1rk9lzxh1dgsnnk638p0fdxvvrnvbd5nxr3r2hx9qpfv72js19rk";
-  SGr-IosevkaTermSS13 = "0dbfmpx0asjichvgk4r2xi1w1mfsl5j496ih7cs5401vzwxm2xji";
-  SGr-IosevkaTermSS14 = "1433cfzzgxw1kb5alyjgfphq3ihwb8m45wpwnk7q9mlbap47wdff";
-  SGr-IosevkaTermSS15 = "15pi839rj3a72f85bbzxqysaykmd4lkfi9pxcvzr0yy0x2iy1cwz";
-  SGr-IosevkaTermSS16 = "1lfhgg5acmdxhkwwc2mp47sa835yhm0lj558gxcf59nd70hc3wak";
-  SGr-IosevkaTermSS17 = "14qp2i3f8r2bcgw8s8xnrykk34ik5p0d37pypf5rj8ph9fyfdjj1";
-  SGr-IosevkaTermSS18 = "0arw7wwgsr0a530jz7835m49ag4sp71zhs5xbc8sbhi9cqg94rdk";
+  Iosevka = "0p386cv1bkbrwx91hxxd0qf9y18sidhj8jzl0b7l0g5gi68v9z67";
+  IosevkaAile = "050j2bhbkl015kkmyz3qzxckfqpy0frg4800biqn20nfh0nd1wmw";
+  IosevkaCurly = "15fs984pbxvazhzcz941zrksg12jrqilflvzcpcnqfg0nyz7w79w";
+  IosevkaCurlySlab = "19n6sx5ag47ysa2qg64n5549r1ig33kzin5ln5mg6x5cfiir6j26";
+  IosevkaEtoile = "1syhrp6cifm989zybh2zvhdk2jwrck8mvmlgppw5wpz4q2d35k30";
+  IosevkaSlab = "16f7j3hqsfk2hnvwwnd5dszwf46r3a18njv1d1szkn2xnw55jgak";
+  IosevkaSS01 = "095rvb62j71hr5n13wxkbq3h36jr5gnv7536zycjlm0h34ff2ryn";
+  IosevkaSS02 = "1k880h5j2ynr88vgflvx7vjk88rh3xs6kblj82pb0li9fvl7c7wd";
+  IosevkaSS03 = "1jp9q00wjz47h66by4jrpfbkmzj15pvz2viqbl0p64kgmjnbak51";
+  IosevkaSS04 = "1djzfhpi92226a606zx9rkf8brvazilafv0bhwsx3zm7msnh1239";
+  IosevkaSS05 = "0k7yzz0xmpwgn9zyiwxz882lwi2xgm9kxp0d5hy684hbzapkydw2";
+  IosevkaSS06 = "1rph461k70yi745l99sfb5i29r0yf0i43v96jj5fgg82rswkjyb8";
+  IosevkaSS07 = "1idkdvfw6267vim2yspdcn8n92i4l7c4dvzgaqm7i3c4jis21cnr";
+  IosevkaSS08 = "02aiksqzccbzmcz81kp1rwxy9wjcanildagjnqksif7md55lsw99";
+  IosevkaSS09 = "1a5vgn5nlb8p5ypz3p9lqs10jfmjgam8iw4i5gm87xl0602nxf4w";
+  IosevkaSS10 = "051hkwkwgjdrb2011rzbq9hy0r26kxakryvhj5wr6cmh4gp59yz8";
+  IosevkaSS11 = "1gqidclxpcqyz3rc3skg3q3h53nhpkpll8ijb4b45sp3bldff110";
+  IosevkaSS12 = "18ijr79d3x4q52h4z4pba1p9l7hn20857v8nqn6nn59j6vrd1b2k";
+  IosevkaSS13 = "1rphwzi8zy39hjka6n5jcmqx9c05wgj0hkndgiyb8mdhi2nxl0wd";
+  IosevkaSS14 = "0ffyp9q5kwvf3d7qzqhaa3dpj0s3d0al76zsa8v92wahc1z20zm7";
+  IosevkaSS15 = "03dnpmjjvgnnagmqghnlxwd33xlg3frz44q0w0ri98pbls1zgysi";
+  IosevkaSS16 = "0vin643dgis6p81a3x4hfp2y9r0f5kmklpl88ql2pprcxlgr71qx";
+  IosevkaSS17 = "129g4d2xjcv0g8079dwsgc16z8dm8hsvk1l86sci32q34iwp53na";
+  IosevkaSS18 = "09m0qsgxqsja76g4ywjlxc4qc7wb0qkmm7mlx4fracy4jdq4niwk";
+  SGr-Iosevka = "0r3yg2gpg52kp6m63x16j6n54sv32q2vf38cm1p5lbpjd9zbfbi8";
+  SGr-IosevkaCurly = "1bba9f2hrxllxm13mc3lsgdf1f6nk5b84jgp6vrp0kgl6m1pkbls";
+  SGr-IosevkaCurlySlab = "18ypl4wrsd13zlb497nldf5lyd9c5ckc06dkq153884k518p51sy";
+  SGr-IosevkaFixed = "0cwv68dpql583ydxnlqkzj7c5hv1lhgkag7rl66yx3zsnxk4mrwb";
+  SGr-IosevkaFixedCurly = "01409k12sbw0hpkfbgj1168yp4pxkzazj3cxqc3kjas24hyk7kp9";
+  SGr-IosevkaFixedCurlySlab = "01y62dl3kcczl6wcsj5ccagf8pbqzmmwzf2kvdi3cr27krla944b";
+  SGr-IosevkaFixedSlab = "1bmw2n7wd8zz97754f9i9ks1nyfbnyl3z6hn4h9b8i7wbgf10123";
+  SGr-IosevkaFixedSS01 = "1scz7ag493v62q5azv2wv5habjmhdxcx56nh45ha65m1p0syjywg";
+  SGr-IosevkaFixedSS02 = "0hzgz8x4x06f3nw7z60zrvg2f28nzpxib1m76dvdq7cf1yjspwrw";
+  SGr-IosevkaFixedSS03 = "0mj7232ppva8hd7212rdz3l6inmgcy1ccicwf74j49zcj6d2i2l1";
+  SGr-IosevkaFixedSS04 = "14mjbkaf5q426225mfia2fpwywh3vq6dsw296acgg5ja80xsfm4r";
+  SGr-IosevkaFixedSS05 = "03ij2jsn1c6imbm42mhirn33dy66jlq6p854ss4scxgki4aiv2lb";
+  SGr-IosevkaFixedSS06 = "1s8ygxi0xgdwk3pvcnvhcbhqrcpmgipvs1w1v7jcb6mg5158s4xl";
+  SGr-IosevkaFixedSS07 = "183k6v2spd20578p8kfga54s9gzpfywjm4frdab0rnyffjhs1inr";
+  SGr-IosevkaFixedSS08 = "17mxmvmvn8l6yhd8ww69w81sv76zih8jhs9msz3ajrsrhq5glb9y";
+  SGr-IosevkaFixedSS09 = "0f8yrdi6n989v9ppb76gswsri9rnzyhi5cxvqmhmwixgb812crlc";
+  SGr-IosevkaFixedSS10 = "0i35zvqbr4sbafi07bvhcj4h1a6g5r3rgba57bi6zwihmmw6ysq8";
+  SGr-IosevkaFixedSS11 = "0zyrg10q3223q26kfnprmfanzck74943gqavyfy4iqq1dlwzq9sz";
+  SGr-IosevkaFixedSS12 = "1n9rcmxz3hwp300qcddlqydmj40ajy15cgv22z82qg608a3l1h14";
+  SGr-IosevkaFixedSS13 = "0b1zcqyn5zblqsz28myjw3py6c9cllml2nisyapsbs4yxy96sck7";
+  SGr-IosevkaFixedSS14 = "";
+  SGr-IosevkaFixedSS15 = "0cc7hik5d9cbfhwmazflwd6h3ddhy88892f1hr2z9bwgri47h2pp";
+  SGr-IosevkaFixedSS16 = "0cdi4jw5lig1i2v54dk35p9wjkl2bld6ldxxrg32smwik9zx9dpc";
+  SGr-IosevkaFixedSS17 = "1g7xqw50i589l5hqgb97gd1phyn9x1sij404k91g331bwmj4icl5";
+  SGr-IosevkaFixedSS18 = "19g3qprnfkr77p8zi14xdzyya5pssmv1rx8vsjahrkbyg2hxwcm7";
+  SGr-IosevkaSlab = "10pjqvqm1kssani9j1p4rryz3kz71jxrzh4xpr687j8sqjr0qkgh";
+  SGr-IosevkaSS01 = "10ls2xwg08m6nkmq9c7zfi9j5b957hwaxkb8yh136w0smd5lql07";
+  SGr-IosevkaSS02 = "121bbkybz8wxmpm0mrfc1fpa2n9l8624lcy867gf25kw4j0z360y";
+  SGr-IosevkaSS03 = "1p75ixf4myfs6wmc3z1jilkip34gjhmkkqs98js4adbzb14ys3fi";
+  SGr-IosevkaSS04 = "1mizbsfh7chzpdjpfbq47bvnz60n954jp7s8ni8mkafl2zm3jdja";
+  SGr-IosevkaSS05 = "0plaby57yqgz97hzypfmzlcp8aijycwnh7276ynzmy4irdiqariq";
+  SGr-IosevkaSS06 = "1gj6syx1zmhxiq2s33zza0wql9in0qcvbckb92yd51xsg8w5fwiq";
+  SGr-IosevkaSS07 = "0pdkwcr8lxq3gm03sv5cbicnb70jxbdymrmwk31lcrq0qf2mg0wl";
+  SGr-IosevkaSS08 = "1bfgv6l056pz421shil0z9vv4slzbqnl4q1dv422isffbxgbn28a";
+  SGr-IosevkaSS09 = "00rslbcc354phz8w5i2q2l9ds0vlpzym1n30rysc9w83yn4qnlnd";
+  SGr-IosevkaSS10 = "004mnamygjfcr09ylhzglxzclfi39yz81kqj87zynklnavb7yvzr";
+  SGr-IosevkaSS11 = "07m80h8kggxzpg2w0f5zx7r3nqjhwmx23l4rldbxgb4qgy08svlb";
+  SGr-IosevkaSS12 = "0pivpcmgxl4pgm4kfaid91jidpxvzdn0ma9dmi68nf0wyjxp9l2r";
+  SGr-IosevkaSS13 = "0nki8q2zykwc9cdrnqr941agfqz5l54nswy6388fmqyxp5d9j1jy";
+  SGr-IosevkaSS14 = "0p57i63v3iii56jj79pzm8jzbapjraiww3lda52wdsa4g3m3pyzl";
+  SGr-IosevkaSS15 = "1izkbr45bccwpx00crk2ib8ixa04j441iv25liib38zn7xgyf2cf";
+  SGr-IosevkaSS16 = "19xc6n5pn3xnng32rck0h5kfwy38yjzygbad4pm3ygqm6rh2rcs4";
+  SGr-IosevkaSS17 = "14n7ikpfry5bavwr9awhli94q46iby5997gdndwjgr0aq8hwk72d";
+  SGr-IosevkaSS18 = "1mif5zsmfs4cdb8y79awnzgk1m053j2fqnspmk4llfgv2knv6y75";
+  SGr-IosevkaTerm = "0q69644wdp5szk7ijzin8877jmfa7c0xw9dd7rznn41140hxy2ld";
+  SGr-IosevkaTermCurly = "0xaw2xmmcnmrxac37x4wwkywzbb1hniv9ngcil89937ih00f3v2l";
+  SGr-IosevkaTermCurlySlab = "1426k5q1kbci4y95yv2cf2b8ajp3q73kpiqg0xn43dp2ji1s7p3j";
+  SGr-IosevkaTermSlab = "0frv0sh6lsysn2xccpq59rlhdclpzqi44v0xw8vrpw1chw18pnqj";
+  SGr-IosevkaTermSS01 = "1dlwfzfjg7ayri9njdyhh8mmgr7lzj698qphgd1kgih9cvpsapxk";
+  SGr-IosevkaTermSS02 = "1j3zyj35dk15v68n7zs78vzgmsdqsvdwmw40zwznzkqy0jsll2ap";
+  SGr-IosevkaTermSS03 = "0bv33c5y1ja50v7l2702k0vlhjrig78i81wqf73cyy7gsis0q0gc";
+  SGr-IosevkaTermSS04 = "186fbcia31jyz2sgz3qpdmyh0g9qag64hcq2dcym2879qmgwzgm1";
+  SGr-IosevkaTermSS05 = "1mbyn3bdj1d23jj0zc89kq8aspa3g8zf3j3fnicw9ffc47a79kzm";
+  SGr-IosevkaTermSS06 = "0ypp71ydfzik6rfg037d928mvn6w7av13k7hkbzggi0q3l51dpl9";
+  SGr-IosevkaTermSS07 = "0a1ma9dxcq642r5090l25vlsc7ga7gylv4yfzcmr5frhi56a39gl";
+  SGr-IosevkaTermSS08 = "14bpsyzadhs8b7jf7fkcrj17pp42iakbvz4fd8ldy6slgzsv1xbb";
+  SGr-IosevkaTermSS09 = "07hwh8547hqsg4w4gdimc5cl3qqlc937xxc50py9r34rflilckzv";
+  SGr-IosevkaTermSS10 = "1iphz3isv37djyc3xl85b5zjp3760bf216fmg5v0lswxsfaisg8c";
+  SGr-IosevkaTermSS11 = "1f6axizf4d6jilcb1riznfrznrlsyf4ddaisr7clx91vd22mrcdl";
+  SGr-IosevkaTermSS12 = "05rx7mrq3nmqb1257gyw6sjq6y6gf2j5bkkabsj2b3iq1hwzkcdd";
+  SGr-IosevkaTermSS13 = "1x0q3cmdzxa6kvdrnqq5znrcici70cwxha9va99d1vadvz2qjbc3";
+  SGr-IosevkaTermSS14 = "07xqpca7ahkawcb4m0wf45ikwvm7nfgc5v10cfpn41jgnfighqf9";
+  SGr-IosevkaTermSS15 = "0ql2sfkayj3vpk86fvw76gnfcpfdaskxymlhb2ij1jz6ckgqgfny";
+  SGr-IosevkaTermSS16 = "1nr6ms7ybgb74k8zb38rb2rl9q20c8shkx2xfdmgx5qg86dwc9pd";
+  SGr-IosevkaTermSS17 = "0c75xp0w59wypiq8zhzpzwa6n8spmvzm1z067fwy8wmq8sp0i500";
+  SGr-IosevkaTermSS18 = "1rq4ra8al9x7dqv6l12y36pm4vrqkqx2c5rgzc3c6awnwk71rqbz";
 }

From c0c7eea70b2a954a81f0be5fbe333c6fbbeed1ec Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 29 Apr 2025 03:26:59 +0200
Subject: [PATCH 25/48] pretix: 2025.3.0 -> 2025.4.0

https://pretix.eu/about/en/blog/20250428-release-2025-4-0/
---
 pkgs/by-name/pr/pretix/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index d417a13e161e..0b755a72229d 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -40,13 +40,13 @@ let
   };
 
   pname = "pretix";
-  version = "2025.3.0";
+  version = "2025.4.0";
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix";
     rev = "refs/tags/v${version}";
-    hash = "sha256-D/j1RzKhRvdqMxcHg/NPZSoroN3etzh6/V38XV9W1cs=";
+    hash = "sha256-K/llv85CWp+V70BiYAR7lT+urGdLbXBhWpCptxUqDrc=";
   };
 
   npmDeps = buildNpmPackage {
@@ -54,7 +54,7 @@ let
     inherit version src;
 
     sourceRoot = "${src.name}/src/pretix/static/npm_dir";
-    npmDepsHash = "sha256-6qjG0p7pLtTd9CBVVzoeUPv6Vdr5se1wuI5qcKJH2Os=";
+    npmDepsHash = "sha256-FqwgHmIUfcipVbeXmN4uYPHdmnuaSgOQ9LHgKRf16ys=";
 
     dontBuild = true;
 

From f76ab273147bde6dd3ebea398f9317187e38c077 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Apr 2025 01:54:07 +0000
Subject: [PATCH 26/48] ripunzip: 2.0.1 -> 2.0.2

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

diff --git a/pkgs/by-name/ri/ripunzip/package.nix b/pkgs/by-name/ri/ripunzip/package.nix
index a92406128c93..b06fb109bc2e 100644
--- a/pkgs/by-name/ri/ripunzip/package.nix
+++ b/pkgs/by-name/ri/ripunzip/package.nix
@@ -13,17 +13,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ripunzip";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "ripunzip";
     rev = "v${version}";
-    hash = "sha256-Y4p3CFE8MyEQJ/af0g2/EL4kto/VZABvD5OS0rRuo8g=";
+    hash = "sha256-IPa7LvwB6RqebJXWKz4DZE5o/ob0sV7mVp6a/F0qsbU=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-lhStxg8H2T29eFYDFAZhFjOyH4hfRwEmcewm7Ec/oTw=";
+  cargoHash = "sha256-3bzIScXVxT8HFmFc0svincvTyuT2F2nfFs/3ApnCBUs=";
 
   buildInputs =
     [ openssl ]

From 68f5c2fd841c28ed353580f9c387e0c2a63ce944 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Apr 2025 02:48:27 +0000
Subject: [PATCH 27/48] gat: 0.22.0 -> 0.23.0

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

diff --git a/pkgs/by-name/ga/gat/package.nix b/pkgs/by-name/ga/gat/package.nix
index b383e8e9f582..96cf6ad285fc 100644
--- a/pkgs/by-name/ga/gat/package.nix
+++ b/pkgs/by-name/ga/gat/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "gat";
-  version = "0.22.0";
+  version = "0.23.0";
 
   src = fetchFromGitHub {
     owner = "koki-develop";
     repo = "gat";
     tag = "v${version}";
-    hash = "sha256-DJv7vll4I6jHpW7O7rc+Sn+Cr63Z1P4rZsIj5FPBEGw=";
+    hash = "sha256-NZ2pa2jewYmEGkRITfOfXeVWhfkfU0TQFKbkwkTsHNs=";
   };
 
-  vendorHash = "sha256-TUMfQBQaoJu731qYQuQ41K9JJvGocbbNpkX2LpkhHNc=";
+  vendorHash = "sha256-Fcj0APGk1C4leZoUphrj0Vi7XWClMfQsOb9wDoMfQrU=";
 
   env.CGO_ENABLED = 0;
 

From 6945b08041b2d56b18d97c29bca441a816331be4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Apr 2025 03:30:48 +0000
Subject: [PATCH 28/48] charmcraft: 3.4.4 -> 3.4.5

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

diff --git a/pkgs/by-name/ch/charmcraft/package.nix b/pkgs/by-name/ch/charmcraft/package.nix
index 660bdfc2d112..460c16d4ff9f 100644
--- a/pkgs/by-name/ch/charmcraft/package.nix
+++ b/pkgs/by-name/ch/charmcraft/package.nix
@@ -8,7 +8,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "charmcraft";
-  version = "3.4.4";
+  version = "3.4.5";
 
   pyproject = true;
 
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
     owner = "canonical";
     repo = "charmcraft";
     tag = version;
-    hash = "sha256-EdpnTKbSDo2ZF4J/bWlcBYWuPSkxW3dmrQYjBeIyTzo=";
+    hash = "sha256-h2lviMU81KksEIltpOH+Oka8NWyKn9CrFP+lSyEMmLM=";
   };
 
   postPatch = ''

From d984889fa9b23fc329790a0f06870a2c418b5edd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Apr 2025 04:44:59 +0000
Subject: [PATCH 29/48] grafana-alloy: 1.8.1 -> 1.8.2

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

diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix
index 653494758c6b..5fbdc21fcd10 100644
--- a/pkgs/by-name/gr/grafana-alloy/package.nix
+++ b/pkgs/by-name/gr/grafana-alloy/package.nix
@@ -17,13 +17,13 @@
 
 buildGoModule rec {
   pname = "grafana-alloy";
-  version = "1.8.1";
+  version = "1.8.2";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "alloy";
     tag = "v${version}";
-    hash = "sha256-QuKwsKIm42hcWgLq2etjvBf+NDGiMVPQkKdQJZrFxUg=";
+    hash = "sha256-xbMbCxgwH3Ea3SBKZXzCIEv+AX7OQJmIqAx9PZkmkHo=";
   };
 
   proxyVendor = true;

From c8f4df349c07e9e0737b1bddd0715ebfe192de1e Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Tue, 29 Apr 2025 01:02:53 -0400
Subject: [PATCH 30/48] livekit: add test

---
 nixos/tests/all-tests.nix           |  1 +
 nixos/tests/networking/livekit.nix  | 25 +++++++++++++++++++++++++
 pkgs/by-name/li/livekit/package.nix |  3 +++
 3 files changed, 29 insertions(+)
 create mode 100644 nixos/tests/networking/livekit.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 2f650f36bb0e..edc4b3674763 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -731,6 +731,7 @@ in
   lidarr = handleTest ./lidarr.nix { };
   lightdm = handleTest ./lightdm.nix { };
   lighttpd = runTest ./lighttpd.nix;
+  livekit = runTest ./networking/livekit.nix;
   limesurvey = handleTest ./limesurvey.nix { };
   limine = import ./limine { inherit runTest; };
   listmonk = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./listmonk.nix { };
diff --git a/nixos/tests/networking/livekit.nix b/nixos/tests/networking/livekit.nix
new file mode 100644
index 000000000000..3f72ee5a050c
--- /dev/null
+++ b/nixos/tests/networking/livekit.nix
@@ -0,0 +1,25 @@
+{
+  pkgs,
+  lib,
+  ...
+}:
+{
+  name = "livekit";
+  meta.maintainers = [ lib.maintainers.quadradical ];
+
+  nodes.machine = {
+    services.livekit = {
+      enable = true;
+      keyFile = pkgs.writers.writeYAML "keys.yaml" {
+        key = "f6lQGaHtM5HfgZjIcec3cOCRfiDqIine4CpZZnqdT5cE";
+      };
+      settings.port = 8000;
+    };
+  };
+
+  testScript = ''
+    machine.wait_for_unit("livekit.service")
+    machine.wait_for_open_port(8000)
+    machine.succeed("curl 127.0.0.1:8000 -L --fail")
+  '';
+}
diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix
index 4f023ced0b09..35abab93682f 100644
--- a/pkgs/by-name/li/livekit/package.nix
+++ b/pkgs/by-name/li/livekit/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nixosTests,
 }:
 
 buildGoModule rec {
@@ -23,6 +24,8 @@ buildGoModule rec {
     mv $out/bin/server $out/bin/livekit-server
   '';
 
+  passthru.tests = nixosTests.livekit;
+
   meta = with lib; {
     description = "End-to-end stack for WebRTC. SFU media server and SDKs";
     homepage = "https://livekit.io/";

From ba9ab12dc2c37ee6c1814b0150087230f2e0962a Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Tue, 29 Apr 2025 01:03:33 -0400
Subject: [PATCH 31/48] nixos/lk-jwt-service:  add test

---
 nixos/tests/all-tests.nix                  |  1 +
 nixos/tests/matrix/lk-jwt-service.nix      | 26 ++++++++++++++++++++++
 pkgs/by-name/lk/lk-jwt-service/package.nix |  3 +++
 3 files changed, 30 insertions(+)
 create mode 100644 nixos/tests/matrix/lk-jwt-service.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index edc4b3674763..a12647ec8da1 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -737,6 +737,7 @@ in
   listmonk = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./listmonk.nix { };
   litellm = runTest ./litellm.nix;
   litestream = handleTest ./litestream.nix { };
+  lk-jwt-service = runTest ./matrix/lk-jwt-service.nix;
   lldap = handleTest ./lldap.nix { };
   localsend = handleTest ./localsend.nix { };
   locate = handleTest ./locate.nix { };
diff --git a/nixos/tests/matrix/lk-jwt-service.nix b/nixos/tests/matrix/lk-jwt-service.nix
new file mode 100644
index 000000000000..3914200babd6
--- /dev/null
+++ b/nixos/tests/matrix/lk-jwt-service.nix
@@ -0,0 +1,26 @@
+{
+  pkgs,
+  lib,
+  ...
+}:
+{
+  name = "lk-jwt-service";
+  meta.maintainers = [ lib.maintainers.quadradical ];
+
+  nodes.machine = {
+    services.lk-jwt-service = {
+      enable = true;
+      keyFile = pkgs.writers.writeYAML "keys.yaml" {
+        key = "f6lQGaHtM5HfgZjIcec3cOCRfiDqIine4CpZZnqdT5cE";
+      };
+      livekitUrl = "wss://127.0.0.1:8100";
+      port = 8000;
+    };
+  };
+
+  testScript = ''
+    machine.wait_for_unit("lk-jwt-service.service")
+    machine.wait_for_open_port(8000)
+    machine.succeed('curl 127.0.0.1:8000/sfu/get -sLX POST -w "%{http_code}" | grep -q "^400"')
+  '';
+}
diff --git a/pkgs/by-name/lk/lk-jwt-service/package.nix b/pkgs/by-name/lk/lk-jwt-service/package.nix
index e4bfee63f589..979a882ece94 100644
--- a/pkgs/by-name/lk/lk-jwt-service/package.nix
+++ b/pkgs/by-name/lk/lk-jwt-service/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nixosTests,
 }:
 
 buildGoModule (finalAttrs: {
@@ -17,6 +18,8 @@ buildGoModule (finalAttrs: {
 
   vendorHash = "sha256-47eJO1Ai78RuhlEPn/J1cd+YSqvmfUD8cuPZIqsdxvI=";
 
+  passthru.tests = nixosTests.lk-jwt-service;
+
   meta = with lib; {
     changelog = "https://github.com/element-hq/lk-jwt-service/releases/tag/${finalAttrs.src.tag}";
     description = "Minimal service to issue LiveKit JWTs for MatrixRTC";

From 67ef8994e516fce09d0f7c82409e23c38c5366dd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Apr 2025 05:43:41 +0000
Subject: [PATCH 32/48] devcontainer: 0.75.0 -> 0.76.0

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

diff --git a/pkgs/by-name/de/devcontainer/package.nix b/pkgs/by-name/de/devcontainer/package.nix
index c944fb162903..278307f174d5 100644
--- a/pkgs/by-name/de/devcontainer/package.nix
+++ b/pkgs/by-name/de/devcontainer/package.nix
@@ -19,18 +19,18 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "devcontainer";
-  version = "0.75.0";
+  version = "0.76.0";
 
   src = fetchFromGitHub {
     owner = "devcontainers";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mzS5ejiD8HuvcD6aHIgbRU1pi43P8AiuDLaIlwpGllE=";
+    hash = "sha256-yTXAzyvkPO/7Xg+F4+hlLkyTpGHAqW3/3scJElfDfxA=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-ix9rixdrvt6hYtx4QTvsg3fm2uz3MvZxFZQfKkTDWc8=";
+    hash = "sha256-4NaZEA00dNPHAb7pcasufKf/4b8ufwS2lNS+a0rxbv8=";
   };
 
   nativeBuildInputs = [

From a677d5c8c3adfffcb46fe4b88b313986d527177b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Apr 2025 06:43:21 +0000
Subject: [PATCH 33/48] python312Packages.types-s3transfer: 0.11.5 -> 0.12.0

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

diff --git a/pkgs/development/python-modules/types-s3transfer/default.nix b/pkgs/development/python-modules/types-s3transfer/default.nix
index f6e294b9e82d..ea5fbb47b4fc 100644
--- a/pkgs/development/python-modules/types-s3transfer/default.nix
+++ b/pkgs/development/python-modules/types-s3transfer/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "types-s3transfer";
-  version = "0.11.5";
+  version = "0.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "types_s3transfer";
     inherit version;
-    hash = "sha256-+pGVAG7qPf3VGvX1Gz3DpPV1aW8yO7AgLQPdPq6gEWY=";
+    hash = "sha256-+PWSAUgekENihzvwvjJn8lnWCtlG69/LhH0JKh+ib5g=";
   };
 
   build-system = [ setuptools ];

From 807101012dba68d5318c3fa6bcc20365e143eaa7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Apr 2025 06:47:35 +0000
Subject: [PATCH 34/48] python312Packages.langgraph-checkpoint: 2.0.24 ->
 2.0.25

---
 .../python-modules/langgraph-checkpoint/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-checkpoint/default.nix b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
index a6ead03a494d..f80cab9c3982 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-checkpoint";
-  version = "2.0.24";
+  version = "2.0.25";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = "checkpoint==${version}";
-    hash = "sha256-NlTpBXBeADlIHQDlt0muJEuoKOgXiAtAo8GoU5CsvZo=";
+    hash = "sha256-MmbdG5oYLG3rwJ1kr9oJuaWc0Wo7nvqEoFwO9DAw7oM=";
   };
 
   sourceRoot = "${src.name}/libs/checkpoint";

From b3c1e31e2491b6508efaa2a53ab23504511052d2 Mon Sep 17 00:00:00 2001
From: eymeric <eymericdechelette@gmail.com>
Date: Tue, 29 Apr 2025 08:59:05 +0200
Subject: [PATCH 35/48] hyperhdr: unvendoring

---
 pkgs/by-name/hy/hyperhdr/package.nix    |  36 +--
 pkgs/by-name/hy/hyperhdr/unvendor.patch | 295 ++++++++++++++++++++++++
 2 files changed, 316 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/by-name/hy/hyperhdr/unvendor.patch

diff --git a/pkgs/by-name/hy/hyperhdr/package.nix b/pkgs/by-name/hy/hyperhdr/package.nix
index 9648a5568621..0a9463febbf0 100644
--- a/pkgs/by-name/hy/hyperhdr/package.nix
+++ b/pkgs/by-name/hy/hyperhdr/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   pkg-config,
   alsa-lib,
@@ -15,6 +14,11 @@
   qmqtt,
   xz,
   sdbus-cpp_2,
+  plutovg,
+  lunasvg,
+  nanopb,
+  linalg,
+  stb,
 }:
 
 let
@@ -31,9 +35,7 @@ stdenv.mkDerivation rec {
     owner = "awawa-dev";
     repo = "HyperHDR";
     tag = "v${version}";
-    hash = "sha256-S4in3fVjbkPfQe7ubuoUJ6AKha2luSjZPFS55aSo2jU=";
-    fetchSubmodules = true;
-    deepClone = true;
+    hash = "sha256-CSggawgUPkpeADc8VXs5FA+ubZAtrtTu0qYgIWA0V/c=";
   };
 
   nativeBuildInputs = [
@@ -43,35 +45,39 @@ stdenv.mkDerivation rec {
   ];
 
   patches = [
-    # https://github.com/awawa-dev/HyperHDR/pull/1140
-    # This can be removed on next release
-    (fetchpatch {
-      name = "USE_SYSTEM_SDBUS_CPP_LIBS";
-      url = "https://github.com/awawa-dev/HyperHDR/pull/1140.patch";
-      hash = "sha256-Fuog++K3qaDeC/HymLPl5RF0yolNFL891EY4f36ILwE=";
-    })
+    # Allow completly unvendoring hyperhdr
+    # This can be removed on the next hyperhdr release
+    ./unvendor.patch
   ];
 
   cmakeFlags = [
     "-DPLATFORM=linux"
-    (cmakeBool "USE_SYSTEM_SDBUS_CPP_LIBS" true)
-    (cmakeBool "USE_SYSTEM_MQTT_LIBS" true)
     (cmakeBool "USE_SYSTEM_FLATBUFFERS_LIBS" true)
+    (cmakeBool "USE_SYSTEM_LUNASVG_LIBS" true)
     (cmakeBool "USE_SYSTEM_MBEDTLS_LIBS" true)
+    (cmakeBool "USE_SYSTEM_MQTT_LIBS" true)
+    (cmakeBool "USE_SYSTEM_NANOPB_LIBS" true)
+    (cmakeBool "USE_SYSTEM_SDBUS_CPP_LIBS" true)
+    (cmakeBool "USE_SYSTEM_STB_LIBS" true)
   ];
 
   buildInputs = [
     alsa-lib
     flatbuffers
     libjpeg_turbo
-    mdns
+    linalg
+    lunasvg
     mbedtls
+    mdns
+    nanopb
     pipewire
+    plutovg
     qmqtt
     qt6Packages.qtbase
     qt6Packages.qtserialport
-    xz
     sdbus-cpp_2
+    stb
+    xz
   ];
 
   meta = with lib; {
diff --git a/pkgs/by-name/hy/hyperhdr/unvendor.patch b/pkgs/by-name/hy/hyperhdr/unvendor.patch
new file mode 100644
index 000000000000..c0c93d21bc8a
--- /dev/null
+++ b/pkgs/by-name/hy/hyperhdr/unvendor.patch
@@ -0,0 +1,295 @@
+diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml
+index 6007f64..a98a23c 100644
+--- a/.github/workflows/push-master.yml
++++ b/.github/workflows/push-master.yml
+@@ -2,7 +2,7 @@ name: HyperHDR CI Build
+ 
+ on:
+   push:
+-#  pull_request:
++  pull_request:
+ 
+ env:
+     USE_CACHE: ${{ vars.USE_CACHE && vars.USE_CACHE || true }}
+@@ -109,6 +109,7 @@ jobs:
+ 
+       - name: Clear branch ccache storage
+         uses: yumemi-inc/clean-cache-action@v1
++        continue-on-error: true
+         with:
+           ref: ${{ github.event.ref }}
+           key: ${{ matrix.linuxVersion }}-${{ matrix.dockerImage }}-ccache-
+@@ -193,6 +194,7 @@ jobs:
+ 
+       - name: Clear branch ccache storage
+         uses: yumemi-inc/clean-cache-action@v1
++        continue-on-error: true
+         with:
+           ref: ${{ github.event.ref }}
+           key: macOS-ccache-${{ matrix.NICE_NAME }}
+@@ -284,6 +286,7 @@ jobs:
+ 
+       - name: Clear branch ccache storage
+         uses: yumemi-inc/clean-cache-action@v1
++        continue-on-error: true
+         with:
+           ref: ${{ github.event.ref }}
+           key: ${{ runner.os }}-ccache
+diff --git a/BUILDING.md b/BUILDING.md
+index 0347079..759cd6a 100644
+--- a/BUILDING.md
++++ b/BUILDING.md
+@@ -44,6 +44,10 @@ Use -D prefix when configuring the build.
+   * USE_CCACHE_CACHING = ON | OFF, enable CCache support if available
+   * USE_SYSTEM_MQTT_LIBS = ON | OFF, prefer system qMQTT libs
+   * USE_SYSTEM_FLATBUFFERS_LIBS = ON | OFF, prefer system Flatbuffers libs
++  * USE_SYSTEM_SDBUS_CPP_LIBS = ON | OFF, prefer system sdbus_c++ libs
++  * USE_SYSTEM_LUNASVG_LIBS = ON | OFF, prefer system lunasvg libs
++  * USE_SYSTEM_NANOPB_LIBS = ON | OFF, prefer system nanopb libs
++  * USE_SYSTEM_STB_LIBS = ON | OFF, prefer system stb libs
+   * USE_STATIC_QT_PLUGINS = ON | OFF, embed static QT-plugins into the application
+   * USE_STANDARD_INSTALLER_NAME = ON | OFF, use standard Linux package naming
+ 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b918a81..fbf8d6b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,6 +34,10 @@ SET ( DEFAULT_PROTOBUF                    ON  )
+ SET ( DEFAULT_WS281XPWM                   OFF )
+ SET ( DEFAULT_USE_SYSTEM_FLATBUFFERS_LIBS ON  )
+ SET ( DEFAULT_USE_SYSTEM_MQTT_LIBS        OFF )
++SET ( DEFAULT_USE_SYSTEM_SDBUS_CPP_LIBS   OFF )
++SET ( DEFAULT_USE_SYSTEM_LUNASVG_LIBS     OFF )
++SET ( DEFAULT_USE_SYSTEM_NANOPB_LIBS      OFF )
++SET ( DEFAULT_USE_SYSTEM_STB_LIBS         OFF )
+ SET ( DEFAULT_MF                          OFF )
+ SET ( DEFAULT_DX                          OFF )
+ SET ( DEFAULT_AVF                         OFF )
+@@ -509,6 +513,18 @@ colorMe("USE_SYSTEM_MQTT_LIBS = " ${USE_SYSTEM_MQTT_LIBS})
+ option(USE_SYSTEM_FLATBUFFERS_LIBS "Use system flatbuffers libs" ${DEFAULT_USE_SYSTEM_FLATBUFFERS_LIBS})
+ colorMe("USE_SYSTEM_FLATBUFFERS_LIBS = " ${USE_SYSTEM_FLATBUFFERS_LIBS})
+ 
++option(USE_SYSTEM_SDBUS_CPP_LIBS "Use system sdbus-c++ libs" ${DEFAULT_USE_SYSTEM_SDBUS_CPP_LIBS})
++colorMe("USE_SYSTEM_SDBUS_CPP_LIBS = " ${USE_SYSTEM_SDBUS_CPP_LIBS})
++
++option(USE_SYSTEM_LUNASVG_LIBS "Use system lunasvg libs" ${DEFAULT_USE_SYSTEM_LUNASVG_LIBS})
++colorMe("USE_SYSTEM_LUNASVG_LIBS = " ${USE_SYSTEM_LUNASVG_LIBS})
++
++option(USE_SYSTEM_NANOPB_LIBS "Use system nanopb libs" ${DEFAULT_USE_SYSTEM_NANOPB_LIBS})
++colorMe("USE_SYSTEM_NANOPB_LIBS = " ${USE_SYSTEM_NANOPB_LIBS})
++
++option(USE_SYSTEM_STB_LIBS "Use system stb libs" ${DEFAULT_USE_SYSTEM_STB_LIBS})
++colorMe("USE_SYSTEM_STB_LIBS = " ${USE_SYSTEM_STB_LIBS})
++
+ option(USE_STATIC_QT_PLUGINS "Enable static QT plugins" ${DEFAULT_STATIC_QT_PLUGINS})
+ colorMe("USE_STATIC_QT_PLUGINS = " ${USE_STATIC_QT_PLUGINS})
+ 
+diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
+index b4d23ad..38acea2 100644
+--- a/external/CMakeLists.txt
++++ b/external/CMakeLists.txt
+@@ -38,7 +38,7 @@ set_target_properties(sqlite3 PROPERTIES
+ target_compile_definitions(sqlite3 PUBLIC
+ 	SQLITE_THREADSAFE=2
+ 	SQLITE_DEFAULT_MEMSTATUS=0
+-	SQLITE_DEFAULT_SYNCHRONOUS=3	
++	SQLITE_DEFAULT_SYNCHRONOUS=3
+ 	SQLITE_OMIT_AUTHORIZATION
+ 	SQLITE_OMIT_DEPRECATED
+ )
+@@ -47,23 +47,32 @@ target_compile_definitions(sqlite3 PUBLIC
+ # Protobuf-nanopb
+ #=============================================================================
+ 
+-set(PROTOBUF-NANOPB-SOURCES
+-		${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb.h
+-		${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_common.h
+-		${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_common.c
+-		${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_encode.h
+-		${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_encode.c
+-		${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_decode.h
+-		${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_decode.c)
+-
+-add_library(protobuf-nanopb OBJECT ${PROTOBUF-NANOPB-SOURCES})
+-set_target_properties(protobuf-nanopb PROPERTIES OUTPUT_NAME protobuf-nanopb)
+-install(TARGETS protobuf-nanopb EXPORT nanopb-targets
+-	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++if (USE_SYSTEM_NANOPB_LIBS)
++	find_package(nanopb)
++	if (NOT nanopb_FOUND)
++		message(WARNING "Could NOT find nanopb system libraries. Fallback to nanopb submodule.")
++	endif()
++endif()
+ 
+-target_include_directories(protobuf-nanopb INTERFACE
+-	$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/nanopb>
+-	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
++if (NOT USE_SYSTEM_NANOPB_LIBS OR NOT nanopb_FOUND)
++	set(PROTOBUF-NANOPB-SOURCES
++			${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb.h
++			${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_common.h
++			${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_common.c
++			${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_encode.h
++			${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_encode.c
++			${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_decode.h
++			${CMAKE_CURRENT_SOURCE_DIR}/nanopb/pb_decode.c)
++
++	add_library(protobuf-nanopb OBJECT ${PROTOBUF-NANOPB-SOURCES})
++	set_target_properties(protobuf-nanopb PROPERTIES OUTPUT_NAME protobuf-nanopb)
++	install(TARGETS protobuf-nanopb EXPORT nanopb-targets
++		ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
++
++	target_include_directories(protobuf-nanopb INTERFACE
++		$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/nanopb>
++		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
++endif()
+ 
+ #=============================================================================
+ # RPi ws281x
+@@ -75,7 +84,7 @@ if(ENABLE_WS281XPWM)
+ 	string(REPLACE "configure_file(version.h.in version.h)" [=[configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/version.h)]=] FILE_CONTENTS "${FILE_CONTENTS}")
+ 	file(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/rpi_ws281x/CMakeLists.txt" "${FILE_CONTENTS}")
+ 
+-	add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/rpi_ws281x)			
++	add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/rpi_ws281x)
+ endif()
+ 
+ #=============================================================================
+@@ -90,11 +99,22 @@ target_include_directories(linalg INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/linalg"
+ # LUNASVG
+ #=============================================================================
+ 
+-
+ set(no_dev_warnings_backup "$CACHE{CMAKE_WARN_DEPRECATED}")
+ set(CMAKE_WARN_DEPRECATED OFF CACHE INTERNAL "" FORCE)
+-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lunasvg)
+-set_target_properties(lunasvg PROPERTIES POSITION_INDEPENDENT_CODE ON)
++
++if (USE_SYSTEM_LUNASVG_LIBS)
++	find_package(lunasvg GLOBAL)
++	if (NOT lunasvg_FOUND)
++		message(WARNING "Could NOT find lunasvg system libraries. Fallback to lunasvg submodule.")
++	endif()
++endif()
++
++if (NOT USE_SYSTEM_LUNASVG_LIBS OR NOT lunasvg_FOUND)
++	add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lunasvg)
++	set_target_properties(lunasvg PROPERTIES POSITION_INDEPENDENT_CODE ON)
++	set_target_properties(plutovg PROPERTIES POSITION_INDEPENDENT_CODE ON)
++endif()
++
+ set(CMAKE_WARN_DEPRECATED ${no_dev_warnings_backup} CACHE INTERNAL "" FORCE)
+ 
+ #=============================================================================
+@@ -125,7 +145,7 @@ if (NOT USE_SYSTEM_FLATBUFFERS_LIBS OR CMAKE_CROSSCOMPILING)
+ 	cmake_policy(PUSH)
+ 
+ 	set(CMAKE_POLICY_DEFAULT_CMP0071 NEW)
+-	set(FLATBUFFERS_BUILD_TESTS OFF CACHE BOOL "")	
++	set(FLATBUFFERS_BUILD_TESTS OFF CACHE BOOL "")
+ 
+ 	if (NOT CMAKE_CROSSCOMPILING AND USE_PRECOMPILED_HEADERS)
+ 		set(FLATBUFFERS_ENABLE_PCH ON CACHE BOOL "")
+@@ -142,7 +162,7 @@ if (NOT USE_SYSTEM_FLATBUFFERS_LIBS OR CMAKE_CROSSCOMPILING)
+ 		unset(FLATBUFFERS_FLATC_EXECUTABLE)
+ 		set(FLATBUFFERS_BUILD_FLATC OFF CACHE BOOL "")
+ 		set(FLATBUFFERS_BUILD_FLATHASH OFF CACHE BOOL "")
+-		set(FLATBUFFERS_HOST_FLATBUFFERS_DIR ${CMAKE_CURRENT_BINARY_DIR}/host_flatc)		
++		set(FLATBUFFERS_HOST_FLATBUFFERS_DIR ${CMAKE_CURRENT_BINARY_DIR}/host_flatc)
+ 		file(MAKE_DIRECTORY ${FLATBUFFERS_HOST_FLATBUFFERS_DIR})
+ 
+ 		EXECUTE_PROCESS ( WORKING_DIRECTORY ${FLATBUFFERS_HOST_FLATBUFFERS_DIR} RESULT_VARIABLE EXEC_RES
+@@ -168,7 +188,7 @@ if (NOT USE_SYSTEM_FLATBUFFERS_LIBS OR CMAKE_CROSSCOMPILING)
+ 		set(FLATBUFFERS_FLATC_EXECUTABLE "$<TARGET_FILE:flatc>")
+ 	else()
+ 		message( STATUS "Using host flatc compiler: ${FLATBUFFERS_FLATC_EXECUTABLE}")
+-	endif()	
++	endif()
+ 
+ 	cmake_policy(POP)
+ endif()
+@@ -177,7 +197,7 @@ set(FLATBUFFERS_FLATC_EXECUTABLE ${FLATBUFFERS_FLATC_EXECUTABLE} PARENT_SCOPE)
+ set(FLATBUFFERS_INCLUDE_DIRS ${FLATBUFFERS_INCLUDE_DIRS} PARENT_SCOPE)
+ include_directories(${FLATBUFFERS_INCLUDE_DIRS})
+ 
+-if (FLATBUFFERS_INCLUDE_DIRS AND EXISTS "${FLATBUFFERS_INCLUDE_DIRS}/../package.json")		
++if (FLATBUFFERS_INCLUDE_DIRS AND EXISTS "${FLATBUFFERS_INCLUDE_DIRS}/../package.json")
+ 		file(STRINGS "${FLATBUFFERS_INCLUDE_DIRS}/../package.json" _FLATBUFFERS_VERSION_STRING REGEX "^[ \t\r\n]+\"version\":[ \t\r\n]+\"[0-9]+.[0-9]+.[0-9]+\",")
+ 		string(REGEX REPLACE "^[ \t\r\n]+\"version\":[ \t\r\n]+\"([0-9]+.[0-9]+.[0-9]+)\"," "\\1" FLATBUFFERS_PARSE_VERSION "${_FLATBUFFERS_VERSION_STRING}")
+ 		message(STATUS "Using flatbuffers libraries version: \"${FLATBUFFERS_PARSE_VERSION}\"")
+@@ -220,7 +240,7 @@ if ( ENABLE_MQTT )
+ 		# HyperHDR workaround for fixed Qt5 version
+ 		file(READ "${CMAKE_CURRENT_SOURCE_DIR}/qmqtt/CMakeLists.txt" FILE_CONTENTS)
+ 		string(REPLACE "Qt5" "Qt${Qt_VERSION}" FILE_CONTENTS "${FILE_CONTENTS}")
+-		string(REPLACE "find_package" "#find_package" FILE_CONTENTS "${FILE_CONTENTS}")		
++		string(REPLACE "find_package" "#find_package" FILE_CONTENTS "${FILE_CONTENTS}")
+ 		file(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/qmqtt/CMakeLists.txt" "${FILE_CONTENTS}")
+ 
+ 		cmake_policy(PUSH)
+@@ -261,17 +281,41 @@ ENDIF()
+ #=============================================================================
+ 
+ if (UNIX AND NOT APPLE AND (ENABLE_POWER_MANAGEMENT OR ENABLE_PIPEWIRE))
+-	set(SDBUSCPP_BUILD_DOCS OFF CACHE BOOL "No doc")
+-	add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sdbus-cpp)
+-	set_target_properties(sdbus-c++-objlib PROPERTIES POSITION_INDEPENDENT_CODE ON)
++	if (USE_SYSTEM_SDBUS_CPP_LIBS)
++		pkg_check_modules (sdbus-c++ sdbus-c++>=2.0.0)
++
++		if(NOT sdbus-c++_FOUND)
++			message( WARNING "Could not find: sdbus-c++>=2.0.0. Fallback to sdbus-c++ submodule." )
++		endif()
++	endif()
++
++	if(NOT sdbus-c++_FOUND)
++		message( "Using sdbus-c++ submodule." )
++		set(SDBUSCPP_BUILD_DOCS OFF CACHE BOOL "No doc")
++		add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/sdbus-cpp)
++		set_target_properties(sdbus-c++-objlib PROPERTIES POSITION_INDEPENDENT_CODE ON)
++	endif()
+ endif()
+ 
+ #=============================================================================
+ # STB
+ #=============================================================================
+ 
+-add_library(stb INTERFACE )
+-target_include_directories(stb INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/stb)
++add_library(stb INTERFACE)
++
++if (USE_SYSTEM_STB_LIBS)
++	find_path(STB_INCLUDE_DIR stb_image.h PATH_SUFFIXES stb)
++	if (NOT STB_INCLUDE_DIR)
++		message(WARNING "Could NOT find system STB libraries. Falling back to embedded STB.")
++		target_include_directories(stb INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/stb)
++	else()
++		message(STATUS "Found system STB libraries: ${STB_INCLUDE_DIR}")
++		target_include_directories(stb INTERFACE ${STB_INCLUDE_DIR})
++	endif()
++else()
++	target_include_directories(stb INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/stb)
++endif()
++
+ target_compile_definitions(stb INTERFACE
+ 	STB_IMAGE_WRITE_IMPLEMENTATION
+ 	STB_IMAGE_IMPLEMENTATION
+diff --git a/sources/utils-image/CMakeLists.txt b/sources/utils-image/CMakeLists.txt
+index b5ad570..5c9b506 100644
+--- a/sources/utils-image/CMakeLists.txt
++++ b/sources/utils-image/CMakeLists.txt
+@@ -29,13 +29,13 @@ else()
+ 	add_library(utils-image STATIC ${utils_image_SOURCES})
+ endif()
+ 
+-target_include_directories(utils-image PRIVATE stb lunasvg TurboJPEG::TurboJPEG)
++target_include_directories(utils-image PRIVATE stb lunasvg::lunasvg TurboJPEG::TurboJPEG)
+ 
+ target_link_libraries(utils-image PRIVATE
+ 	Qt${Qt_VERSION}::Core
+ 	Qt${Qt_VERSION}::Network
+ 	stb
+-	lunasvg
++	lunasvg::lunasvg
+ 	image
+ 	TurboJPEG::TurboJPEG
+ )

From 6b6a730201a7b5bc072b9dfb132a38c0296fc6fd Mon Sep 17 00:00:00 2001
From: eymeric <eymericdechelette@gmail.com>
Date: Tue, 29 Apr 2025 08:59:18 +0200
Subject: [PATCH 36/48] hyperhdr: Fix dlopen path for alsa-lib

---
 pkgs/by-name/hy/hyperhdr/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/hy/hyperhdr/package.nix b/pkgs/by-name/hy/hyperhdr/package.nix
index 0a9463febbf0..05c4437839f3 100644
--- a/pkgs/by-name/hy/hyperhdr/package.nix
+++ b/pkgs/by-name/hy/hyperhdr/package.nix
@@ -50,6 +50,11 @@ stdenv.mkDerivation rec {
     ./unvendor.patch
   ];
 
+  postPatch = ''
+    substituteInPlace sources/sound-capture/linux/SoundCaptureLinux.cpp \
+      --replace-fail "libasound.so.2" "${lib.getLib alsa-lib}/lib/libasound.so.2"
+  '';
+
   cmakeFlags = [
     "-DPLATFORM=linux"
     (cmakeBool "USE_SYSTEM_FLATBUFFERS_LIBS" true)

From 650017cd982414f652b380e4e5b9da0d0a2061e6 Mon Sep 17 00:00:00 2001
From: eymeric <eymericdechelette@gmail.com>
Date: Tue, 29 Apr 2025 08:59:27 +0200
Subject: [PATCH 37/48] hyperhdr: add eymeric as maintainer

---
 pkgs/by-name/hy/hyperhdr/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/hy/hyperhdr/package.nix b/pkgs/by-name/hy/hyperhdr/package.nix
index 05c4437839f3..f1d593c06ffd 100644
--- a/pkgs/by-name/hy/hyperhdr/package.nix
+++ b/pkgs/by-name/hy/hyperhdr/package.nix
@@ -90,7 +90,10 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/awawa-dev/HyperHDR";
     changelog = "https://github.com/awawa-dev/HyperHDR/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ hexa ];
+    maintainers = with maintainers; [
+      hexa
+      eymeric
+    ];
     mainProgram = "hyperhdr";
     platforms = platforms.linux;
   };

From 8e50a8dc02b937201dcb0c780d2c500fb3f541e8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 29 Apr 2025 09:06:26 +0200
Subject: [PATCH 38/48] python312Packages.correctionlib: 2.6.4 -> 2.7.0

Diff: https://github.com/cms-nanoAOD/correctionlib/compare/refs/tags/v2.6.4...refs/tags/v2.7.0

Changelog: https://github.com/cms-nanoAOD/correctionlib/releases/tag/v2.7.0
---
 .../python-modules/correctionlib/default.nix  | 49 ++++++++-----------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/python-modules/correctionlib/default.nix b/pkgs/development/python-modules/correctionlib/default.nix
index 0d40e8e3ab51..957f5da7ed79 100644
--- a/pkgs/development/python-modules/correctionlib/default.nix
+++ b/pkgs/development/python-modules/correctionlib/default.nix
@@ -2,15 +2,17 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
 
   # build-system
-  cmake,
-  scikit-build,
-  setuptools,
-  setuptools-scm,
   pybind11,
+  scikit-build-core,
+  setuptools-scm,
 
+  # nativeBuildInputs
+  cmake,
+  ninja,
+
+  # buildInputs
   zlib,
 
   # dependencies
@@ -19,7 +21,8 @@
   pydantic,
   rich,
 
-  # checks
+  # tests
+  addBinToPathHook,
   awkward,
   pytestCheckHook,
   scipy,
@@ -27,34 +30,28 @@
 
 buildPythonPackage rec {
   pname = "correctionlib";
-  version = "2.6.4";
+  version = "2.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cms-nanoAOD";
     repo = "correctionlib";
     tag = "v${version}";
-    hash = "sha256-l+JjW/giGzU00z0jBN3D4KB/LjTIxeJb3CS+Ge0gbiA=";
     fetchSubmodules = true;
+    hash = "sha256-aLTeyDOo80p8xzl/IPnpT3BOjS2qOYn/Z7pidcLoEY8=";
   };
 
-  patches = [
-    # fix https://github.com/Tencent/rapidjson/issues/2277
-    (fetchpatch {
-      url = "https://github.com/Tencent/rapidjson/pull/719.diff";
-      hash = "sha256-xarSfi9o73KoJo0ijT0G8fyTSYVuY0+9rLEtfUwas0Q=";
-      extraPrefix = "rapidjson/";
-      stripLen = 1;
-    })
+  build-system = [
+    pybind11
+    scikit-build-core
+    setuptools-scm
   ];
 
-  build-system = [
+  nativeBuildInputs = [
     cmake
-    scikit-build
-    setuptools
-    setuptools-scm
-    pybind11
+    ninja
   ];
+  dontUseCmakeConfigure = true;
 
   buildInputs = [ zlib ];
 
@@ -65,9 +62,10 @@ buildPythonPackage rec {
     rich
   ];
 
-  dontUseCmakeConfigure = true;
-
   nativeCheckInputs = [
+    # One test requires running the produced `correctionlib` binary
+    addBinToPathHook
+
     awkward
     pytestCheckHook
     scipy
@@ -75,11 +73,6 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "correctionlib" ];
 
-  # One test requires running the produced `correctionlib` binary
-  preCheck = ''
-    export PATH=$out/bin:$PATH
-  '';
-
   meta = {
     description = "Provides a well-structured JSON data format for a wide variety of ad-hoc correction factors encountered in a typical HEP analysis";
     mainProgram = "correction";

From 1fc23387aa9e373747d7e7b4cfe0c8b39f516778 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Apr 2025 07:41:10 +0000
Subject: [PATCH 39/48] animeko: 4.9.0 -> 4.9.1

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

diff --git a/pkgs/by-name/an/animeko/package.nix b/pkgs/by-name/an/animeko/package.nix
index 091da058f31d..aa09ff6e5358 100644
--- a/pkgs/by-name/an/animeko/package.nix
+++ b/pkgs/by-name/an/animeko/package.nix
@@ -79,13 +79,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "animeko";
-  version = "4.9.0";
+  version = "4.9.1";
 
   src = fetchFromGitHub {
     owner = "open-ani";
     repo = "animeko";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fxnnOczLs88/OWYqHKTrWQyzqnqeODMKfoE3aQweQTc=";
+    hash = "sha256-NmvZR0NSo9y3vvdLqtyVKUlhCGq4Qu7Pbz/7Ufvf7rQ=";
     fetchSubmodules = true;
   };
 

From a834a94ea79e7109051e100ec024286677fbad66 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 29 Apr 2025 09:41:42 +0200
Subject: [PATCH 40/48] python312Packages.test2ref: init at 0.8.2

---
 .../python-modules/test2ref/default.nix       | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/test2ref/default.nix

diff --git a/pkgs/development/python-modules/test2ref/default.nix b/pkgs/development/python-modules/test2ref/default.nix
new file mode 100644
index 000000000000..4b85ef83314b
--- /dev/null
+++ b/pkgs/development/python-modules/test2ref/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pdm-backend,
+  binaryornot,
+  pytest-cov-stub,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "test2ref";
+  version = "0.8.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "nbiotcloud";
+    repo = "test2ref";
+    tag = "v${version}";
+    hash = "sha256-Rgm7qZc1pFY/9gwzHjnI305Ch9enXzzWRsPZ7CQjzpQ=";
+  };
+
+  build-system = [
+    pdm-backend
+  ];
+
+  dependencies = [
+    binaryornot
+  ];
+
+  pythonImportsCheck = [ "test2ref" ];
+
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Testing Against Learned Reference Data";
+    homepage = "https://github.com/nbiotcloud/test2ref";
+    changelog = "https://github.com/nbiotcloud/test2ref/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1f055b73bc97..cdff365e8b1f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17164,6 +17164,8 @@ self: super: with self; {
 
   test-tube = callPackage ../development/python-modules/test-tube { };
 
+  test2ref = callPackage ../development/python-modules/test2ref { };
+
   testbook = callPackage ../development/python-modules/testbook { };
 
   testcontainers = callPackage ../development/python-modules/testcontainers { };

From d98677027dc02b6b1794a97887e8f118d3339686 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 29 Apr 2025 09:33:36 +0200
Subject: [PATCH 41/48] python312Packages.anytree: 2.12.1 -> 2.13.0

Diff: https://github.com/c0fec0de/anytree/compare/refs/tags/2.12.1...refs/tags/2.13.0

Changelog: https://github.com/c0fec0de/anytree/releases/tag/2.13.0
---
 .../python-modules/anytree/default.nix        | 59 +++++++++----------
 .../python-modules/anytree/graphviz.patch     | 13 ----
 2 files changed, 28 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/development/python-modules/anytree/graphviz.patch

diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix
index 9483bf12dadc..a4b7b9254de3 100644
--- a/pkgs/development/python-modules/anytree/default.nix
+++ b/pkgs/development/python-modules/anytree/default.nix
@@ -2,62 +2,59 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fontconfig,
   graphviz,
-  poetry-core,
-  pytest7CheckHook,
-  pythonOlder,
-  six,
-  replaceVars,
-  withGraphviz ? true,
+
+  # build-system
+  pdm-backend,
+
+  # tests
+  pytest-cov-stub,
+  pytestCheckHook,
+  pyyaml,
+  test2ref,
+  fontconfig,
 }:
 
 buildPythonPackage rec {
   pname = "anytree";
-  version = "2.12.1";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.7";
+  version = "2.13.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "c0fec0de";
     repo = "anytree";
     tag = version;
-    hash = "sha256-5HU8kR3B2RHiGBraQ2FTgVtGHJi+Lha9U/7rpNsYCCI=";
+    hash = "sha256-kFNYJMWagpqixs84+AaNkh/28asLBJhibTP8LEEe4XY=";
   };
 
-  patches = lib.optionals withGraphviz [
-    (replaceVars ./graphviz.patch {
-      inherit graphviz;
-    })
-  ];
-
   postPatch = ''
-    # drop [project.urls] section, poetry-core 2.0 compat issue
-    sed -i "/project\.urls/,+4d" pyproject.toml
+    substituteInPlace src/anytree/exporter/dotexporter.py \
+      --replace-fail \
+        'cmd = ["dot"' \
+        'cmd = ["${lib.getExe' graphviz "dot"}"'
   '';
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ pdm-backend ];
 
-  propagatedBuildInputs = [ six ];
-
-  nativeCheckInputs = [ pytest7CheckHook ];
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytestCheckHook
+    pyyaml
+    test2ref
+  ];
 
   # Tests print “Fontconfig error: Cannot load default config file”
-  preCheck = lib.optionalString withGraphviz ''
+  preCheck = ''
     export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf
   '';
 
-  # Circular dependency anytree → graphviz → pango → glib → gtk-doc → anytree
-  doCheck = withGraphviz;
-
   pythonImportsCheck = [ "anytree" ];
 
-  meta = with lib; {
+  meta = {
     description = "Powerful and Lightweight Python Tree Data Structure";
     homepage = "https://github.com/c0fec0de/anytree";
     changelog = "https://github.com/c0fec0de/anytree/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maitnainers; [ ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maitnainers; [ ];
   };
 }
diff --git a/pkgs/development/python-modules/anytree/graphviz.patch b/pkgs/development/python-modules/anytree/graphviz.patch
deleted file mode 100644
index 583b60444e35..000000000000
--- a/pkgs/development/python-modules/anytree/graphviz.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/anytree/exporter/dotexporter.py b/anytree/exporter/dotexporter.py
-index 9c10a68..209a952 100644
---- a/anytree/exporter/dotexporter.py
-+++ b/anytree/exporter/dotexporter.py
-@@ -228,7 +228,7 @@ class DotExporter(object):
-             for line in self:
-                 dotfile.write(("%s\n" % line).encode("utf-8"))
-             dotfile.flush()
--            cmd = ["dot", dotfilename, "-T", fileformat, "-o", filename]
-+            cmd = ["@graphviz@/bin/dot", dotfilename, "-T", fileformat, "-o", filename]
-             check_call(cmd)
-         try:
-             remove(dotfilename)

From 36c0c11c6ebce89e6d7d83ff0c569a613ab4a05f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 29 Apr 2025 09:52:33 +0200
Subject: [PATCH 42/48] python312Packages.oelint-data: init at 1.0.10

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

diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix
new file mode 100644
index 000000000000..eda30fc39c76
--- /dev/null
+++ b/pkgs/development/python-modules/oelint-data/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  oelint-parser,
+}:
+
+buildPythonPackage rec {
+  pname = "oelint-data";
+  version = "1.0.10";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "priv-kweihmann";
+    repo = "oelint-data";
+    tag = version;
+    hash = "sha256-lBy/aGxcmJ3v5f+0YAJtuk0IK4WpL5iFrgKjyoLswro=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    oelint-parser
+  ];
+
+  pythonImportsCheck = [ "oelint_data" ];
+
+  # No tests
+  doCheck = false;
+
+  meta = {
+    description = "Data for oelint-adv";
+    homepage = "https://github.com/priv-kweihmann/oelint-data";
+    changelog = "https://github.com/priv-kweihmann/oelint-data/releases/tag/${version}";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cdff365e8b1f..2d107b7c8784 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10164,6 +10164,8 @@ self: super: with self; {
 
   odp-amsterdam = callPackage ../development/python-modules/odp-amsterdam { };
 
+  oelint-data = callPackage ../development/python-modules/oelint-data { };
+
   oelint-parser = callPackage ../development/python-modules/oelint-parser { };
 
   oemthermostat = callPackage ../development/python-modules/oemthermostat { };

From b6b6930180ad4bb113fa6b965ec22fae52e3ed9a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 29 Apr 2025 09:32:28 +0200
Subject: [PATCH 43/48] oelint-adv: 6.7.1 -> 7.2.6

Diff: https://github.com/priv-kweihmann/oelint-adv/compare/refs/tags/6.7.1...refs/tags/7.2.6

Changelog: https://github.com/priv-kweihmann/oelint-adv/releases/tag/7.2.6
---
 pkgs/by-name/oe/oelint-adv/package.nix | 27 +++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/oe/oelint-adv/package.nix b/pkgs/by-name/oe/oelint-adv/package.nix
index ec6b6f5c2670..70746ccc5a3b 100644
--- a/pkgs/by-name/oe/oelint-adv/package.nix
+++ b/pkgs/by-name/oe/oelint-adv/package.nix
@@ -7,16 +7,24 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "oelint-adv";
-  version = "6.7.1";
+  version = "7.2.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-adv";
     tag = version;
-    hash = "sha256-rJ1M5YRXcKbDEGhy0G+N2dGD3sx8KFUfLJSLthYQNtU=";
+    hash = "sha256-QNTC8jO6RjHNaHVNSqAoM1xAhYc35G5A7D0yfwmd6+U=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace-fail "--random-order-bucket=global" "" \
+      --replace-fail "--random-order"               "" \
+      --replace-fail "--force-sugar"                "" \
+      --replace-fail "--old-summary"                ""
+  '';
+
   build-system = with python3Packages; [
     setuptools
   ];
@@ -25,6 +33,7 @@ python3Packages.buildPythonApplication rec {
     anytree
     argcomplete
     colorama
+    oelint-data
     oelint-parser
     urllib3
   ];
@@ -50,20 +59,12 @@ python3Packages.buildPythonApplication rec {
 
   passthru.updateScript = nix-update-script { };
 
-  postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace-fail "--random-order-bucket=global" "" \
-      --replace-fail "--random-order"               "" \
-      --replace-fail "--force-sugar"                "" \
-      --replace-fail "--old-summary"                ""
-  '';
-
-  meta = with lib; {
+  meta = {
     description = "Advanced bitbake-recipe linter";
     mainProgram = "oelint-adv";
     homepage = "https://github.com/priv-kweihmann/oelint-adv";
     changelog = "https://github.com/priv-kweihmann/oelint-adv/releases/tag/${version}";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ otavio ];
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ otavio ];
   };
 }

From ac30d44b2c7862b9c3be73d5bc6f60801741a18d Mon Sep 17 00:00:00 2001
From: Anton Mosich <anton@mosich.at>
Date: Fri, 18 Apr 2025 02:08:02 +0200
Subject: [PATCH 44/48] karma-runner: 6.4.2 -> 6.4.4

Also fixes the currently-broken build
---
 .../ka/karma-runner/fix-package-lock.patch    | 53 -------------------
 pkgs/by-name/ka/karma-runner/package.nix      | 18 ++++---
 2 files changed, 10 insertions(+), 61 deletions(-)
 delete mode 100644 pkgs/by-name/ka/karma-runner/fix-package-lock.patch

diff --git a/pkgs/by-name/ka/karma-runner/fix-package-lock.patch b/pkgs/by-name/ka/karma-runner/fix-package-lock.patch
deleted file mode 100644
index c1a835382513..000000000000
--- a/pkgs/by-name/ka/karma-runner/fix-package-lock.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/package-lock.json b/package-lock.json
-index 413cf4d1..1d03d9f5 100644
---- a/package-lock.json
-+++ b/package-lock.json
-@@ -5226,36 +5226,6 @@
-       "integrity": "sha512-ApcjaOdVTJ7y4r08xI5wIqpvwS48Q0PBG4DJROcEkH1f8MdAiNFyFxz3xoL0LWAVwjrwPYZdVHHxhRHcx/uGLA==",
-       "dev": true
-     },
--    "karma": {
--      "version": "file:",
--      "dev": true,
--      "requires": {
--        "@colors/colors": "1.5.0",
--        "body-parser": "^1.19.0",
--        "braces": "^3.0.2",
--        "chokidar": "^3.5.1",
--        "connect": "^3.7.0",
--        "di": "^0.0.1",
--        "dom-serialize": "^2.2.1",
--        "glob": "^7.1.7",
--        "graceful-fs": "^4.2.6",
--        "http-proxy": "^1.18.1",
--        "isbinaryfile": "^4.0.8",
--        "lodash": "^4.17.21",
--        "log4js": "^6.4.1",
--        "mime": "^2.5.2",
--        "minimatch": "^3.0.4",
--        "mkdirp": "^0.5.5",
--        "qjobs": "^1.2.0",
--        "range-parser": "^1.2.1",
--        "rimraf": "^3.0.2",
--        "socket.io": "^4.4.1",
--        "source-map": "^0.6.1",
--        "tmp": "^0.2.1",
--        "ua-parser-js": "^0.7.30",
--        "yargs": "^16.1.1"
--      }
--    },
-     "karma-browserify": {
-       "version": "7.0.0",
-       "resolved": "https://registry.npmjs.org/karma-browserify/-/karma-browserify-7.0.0.tgz",
-diff --git a/package.json b/package.json
-index 347d9e95..90f6d036 100644
---- a/package.json
-+++ b/package.json
-@@ -471,7 +471,6 @@
-     "eslint-plugin-standard": "^4.0.1",
-     "http2": "^3.3.6",
-     "jasmine-core": "^3.6.0",
--    "karma": ".",
-     "karma-browserify": "^7.0.0",
-     "karma-browserstack-launcher": "^1.6.0",
-     "karma-chai": "^0.1.0",
diff --git a/pkgs/by-name/ka/karma-runner/package.nix b/pkgs/by-name/ka/karma-runner/package.nix
index 594267f143ca..7621c6c94350 100644
--- a/pkgs/by-name/ka/karma-runner/package.nix
+++ b/pkgs/by-name/ka/karma-runner/package.nix
@@ -2,27 +2,29 @@
   lib,
   buildNpmPackage,
   fetchFromGitHub,
+  versionCheckHook,
 }:
 
 buildNpmPackage rec {
   pname = "karma";
-  version = "6.4.2";
+  version = "6.4.4";
 
   src = fetchFromGitHub {
     owner = "karma-runner";
     repo = "karma";
-    rev = "v${version}";
-    hash = "sha256-v6IiLz65NS8GwM/FPqRxR5qcFDDu7EqloR0SIensdDI=";
+    tag = "v${version}";
+    hash = "sha256-RfEmzUMzgOY6YG0MBheCgwmwOU3C5G8hybH40gLmsr4=";
   };
 
-  patches = [
-    ./fix-package-lock.patch
-  ];
-
-  npmDepsHash = "sha256-nX4/96WdPEDZ6DASp+AOBbBbHyq+p2zIh2dZUbtmIPI=";
+  npmDepsHash = "sha256-bGtiGLwr9Bmi3Jx2DImpyLhPnxUo7q6YcMCxoxqOkGY=";
 
   env.PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = true;
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+
   meta = {
     description = "Spectacular Test Runner for JavaScript";
     homepage = "http://karma-runner.github.io/";

From 42a94cfd8900666ea623da04158cd08c8e57b710 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Apr 2025 08:14:58 +0000
Subject: [PATCH 45/48] thrift-ls: 0.2.5 -> 0.2.7

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

diff --git a/pkgs/by-name/th/thrift-ls/package.nix b/pkgs/by-name/th/thrift-ls/package.nix
index 3b97e030594d..4db75983afa6 100644
--- a/pkgs/by-name/th/thrift-ls/package.nix
+++ b/pkgs/by-name/th/thrift-ls/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "thrift-ls";
-  version = "0.2.5";
+  version = "0.2.7";
 
   src = fetchFromGitHub {
     owner = "joyme123";
     repo = "thrift-ls";
     rev = "v${version}";
-    hash = "sha256-BkkXvmJ1XmDamU2Mt0BjbSnNVwlBxphW1FvE4x32ja0=";
+    hash = "sha256-QX4ChPjHIY0GtjqmZH5Q4veC+VnMntYIQvwwSds8UUo=";
   };
 
-  vendorHash = "sha256-YoZ2dku84065Ygh9XU6dOwmCkuwX0r8a0Oo8c1HPsS4=";
+  vendorHash = "sha256-SGCJ12BxjFUQ7bnaNY0bvrrtm2qNNrwYKKfNEi1lPco=";
 
   postInstall = ''
     mv $out/bin/thrift-ls $out/bin/thriftls

From 2f262a491a9deb14fc921f51d833263e07290586 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Apr 2025 09:01:49 +0000
Subject: [PATCH 46/48] chatmcp: 0.0.26-alpha -> 0.0.28-alpha

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

diff --git a/pkgs/by-name/ch/chatmcp/package.nix b/pkgs/by-name/ch/chatmcp/package.nix
index a88368499662..a13248597f03 100644
--- a/pkgs/by-name/ch/chatmcp/package.nix
+++ b/pkgs/by-name/ch/chatmcp/package.nix
@@ -14,13 +14,13 @@
 
 flutter329.buildFlutterApplication rec {
   pname = "chatmcp";
-  version = "0.0.26-alpha";
+  version = "0.0.28-alpha";
 
   src = fetchFromGitHub {
     owner = "daodao97";
     repo = "chatmcp";
     tag = "v${version}";
-    hash = "sha256-ayGpP1Tiz2437YDSXIwuFNXWpqReHUuI0Nuaf/aus+Q=";
+    hash = "sha256-QKTZ4gtGEXLGYzQdo1Ej6vFVLpmozywtSWy/fqgQOmI=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;

From 7886dc03bed13f0378d1c8750d81c2b1cade13a5 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 29 Apr 2025 12:24:40 +0300
Subject: [PATCH 47/48] olive-editor: fix eval

Fixes #402773
---
 pkgs/applications/video/olive-editor/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix
index b3cd3512a74d..55cc0d18cfae 100644
--- a/pkgs/applications/video/olive-editor/default.nix
+++ b/pkgs/applications/video/olive-editor/default.nix
@@ -27,7 +27,7 @@ let
     version = "2.4.15.0";
     src = (
       old.src.override {
-        rev = "v${version}";
+        tag = "v${version}";
         hash = "sha256-I2/JPmUBDb0bw7qbSZcAkYHB2q2Uo7En7ZurMwWhg/M=";
       }
     );

From 160b7ac3672041cc61043396ce5cfede68978967 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 29 Apr 2025 13:07:30 +0200
Subject: [PATCH 48/48] esphome: 2025.4.0 -> 2025.4.1

https://github.com/esphome/esphome/releases/tag/2025.4.1
---
 pkgs/by-name/es/esphome/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index 3254453a303e..9a60b0d10629 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -22,14 +22,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "esphome";
-  version = "2025.4.0";
+  version = "2025.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     tag = version;
-    hash = "sha256-qK/vQQdgtYrWUglVaBWDcTbgeDUrDB4rpQ+4q65Hre4=";
+    hash = "sha256-EWSV87z0Npsf/1lDzbk2s4Phx0tZJZnMzubaX+W6fAY=";
   };
 
   build-systems = with python.pkgs; [