From a3068ebb668fc855d16101b1f0c8ec82e1a83635 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Tue, 9 Sep 2025 21:43:42 -0700
Subject: [PATCH 01/25] obs-studio-plugins: inherit platforms from
 obs-studio.meta

Inherits platforms from obs-studio.meta so most builds on aarch64-linux.

Skips the following due to not supporting aarch64-linux:

- looking-glass-obs
- waveform
---
 .../video/obs-studio/plugins/looking-glass-obs.nix           | 1 +
 pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix | 5 +----
 .../video/obs-studio/plugins/obs-aitum-multistream.nix       | 5 +----
 .../obs-studio/plugins/obs-backgroundremoval/default.nix     | 2 +-
 .../video/obs-studio/plugins/obs-command-source.nix          | 5 +----
 .../video/obs-studio/plugins/obs-dir-watch-media.nix         | 5 +----
 .../video/obs-studio/plugins/obs-gradient-source.nix         | 5 +----
 .../video/obs-studio/plugins/obs-hyperion/default.nix        | 2 +-
 .../video/obs-studio/plugins/obs-livesplit-one/default.nix   | 2 +-
 pkgs/applications/video/obs-studio/plugins/obs-markdown.nix  | 5 +----
 .../video/obs-studio/plugins/obs-move-transition.nix         | 5 +----
 .../video/obs-studio/plugins/obs-multi-rtmp/default.nix      | 5 +----
 .../video/obs-studio/plugins/obs-mute-filter.nix             | 5 +----
 pkgs/applications/video/obs-studio/plugins/obs-noise.nix     | 5 +----
 .../video/obs-studio/plugins/obs-pipewire-audio-capture.nix  | 5 +----
 .../video/obs-studio/plugins/obs-retro-effects.nix           | 5 +----
 .../applications/video/obs-studio/plugins/obs-rgb-levels.nix | 5 +----
 .../video/obs-studio/plugins/obs-scale-to-sound.nix          | 5 +----
 .../video/obs-studio/plugins/obs-scene-as-transition.nix     | 5 +----
 .../video/obs-studio/plugins/obs-shaderfilter.nix            | 5 +----
 .../video/obs-studio/plugins/obs-source-record.nix           | 2 +-
 .../video/obs-studio/plugins/obs-source-switcher.nix         | 5 +----
 .../video/obs-studio/plugins/obs-stroke-glow-shadow.nix      | 5 +----
 .../video/obs-studio/plugins/obs-text-pthread.nix            | 5 +----
 .../video/obs-studio/plugins/obs-transition-table.nix        | 5 +----
 pkgs/applications/video/obs-studio/plugins/obs-urlsource.nix | 5 +----
 .../video/obs-studio/plugins/obs-vaapi/default.nix           | 5 +----
 .../video/obs-studio/plugins/obs-vertical-canvas.nix         | 5 +----
 .../video/obs-studio/plugins/obs-vintage-filter.nix          | 5 +----
 pkgs/applications/video/obs-studio/plugins/obs-websocket.nix | 5 +----
 pkgs/applications/video/obs-studio/plugins/pixel-art.nix     | 5 +----
 .../video/obs-studio/plugins/waveform/default.nix            | 1 +
 32 files changed, 32 insertions(+), 108 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix
index a79db9013a5f..c7b13fb5f18d 100644
--- a/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix
+++ b/pkgs/applications/video/obs-studio/plugins/looking-glass-obs.nix
@@ -37,6 +37,7 @@ stdenv.mkDerivation {
     homepage = "https://looking-glass.io/docs/stable/obs/";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ babbaj ];
+    # Hard coded x86_64 support
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix b/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix
index ff4cbf415c9d..b10b8af8b702 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-3d-effect.nix
@@ -33,9 +33,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/exeldro/obs-3d-effect";
     maintainers = with maintainers; [ flexiondotorg ];
     license = licenses.gpl2Plus;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-aitum-multistream.nix b/pkgs/applications/video/obs-studio/plugins/obs-aitum-multistream.nix
index 5d8964588971..9ced9ed8a86b 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-aitum-multistream.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-aitum-multistream.nix
@@ -46,9 +46,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/Aitum/obs-aitum-multistream";
     maintainers = with lib.maintainers; [ flexiondotorg ];
     license = lib.licenses.gpl2Plus;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix
index 08526e81b8ee..955bdfc1eeef 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-backgroundremoval/default.nix
@@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/royshil/obs-backgroundremoval";
     maintainers = with maintainers; [ zahrun ];
     license = licenses.mit;
-    platforms = [ "x86_64-linux" ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix b/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix
index 56236261483a..0696634bb95e 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-command-source.nix
@@ -32,9 +32,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/norihiro/command-source";
     maintainers = with maintainers; [ flexiondotorg ];
     license = licenses.gpl2Plus;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-dir-watch-media.nix b/pkgs/applications/video/obs-studio/plugins/obs-dir-watch-media.nix
index 2ef998788b40..28804383dc6e 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-dir-watch-media.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-dir-watch-media.nix
@@ -29,9 +29,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/exeldro/obs-dir-watch-media";
     maintainers = with maintainers; [ flexiondotorg ];
     license = licenses.gpl2Only;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-gradient-source.nix b/pkgs/applications/video/obs-studio/plugins/obs-gradient-source.nix
index 23a3c3e41d42..c092185b5f90 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-gradient-source.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-gradient-source.nix
@@ -33,9 +33,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/exeldro/obs-gradient-source";
     maintainers = with maintainers; [ flexiondotorg ];
     license = licenses.gpl2Plus;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix
index ee34343c275f..e63c3a9e9d29 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix
@@ -54,6 +54,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/hyperion-project/hyperion-obs-plugin";
     license = licenses.mit;
     maintainers = with maintainers; [ algram ];
-    platforms = [ "x86_64-linux" ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix
index 85089cb35883..4c9ceff91acf 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-livesplit-one/default.nix
@@ -43,6 +43,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = [ maintainers.Bauke ];
-    platforms = obs-studio.meta.platforms;
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-markdown.nix b/pkgs/applications/video/obs-studio/plugins/obs-markdown.nix
index c837952e6c2d..51b6c29f99ad 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-markdown.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-markdown.nix
@@ -29,9 +29,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/exeldro/obs-markdown";
     maintainers = with maintainers; [ flexiondotorg ];
     license = licenses.gpl2Only;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
index 1ee0a0615f7b..5c7527f58efc 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
@@ -29,9 +29,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/exeldro/obs-move-transition";
     maintainers = with maintainers; [ starcraft66 ];
     license = licenses.gpl2Plus;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix
index abd3e2fbe6e5..368325107282 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-multi-rtmp/default.nix
@@ -56,9 +56,6 @@ stdenv.mkDerivation rec {
     description = "Multi-site simultaneous broadcast plugin for OBS Studio";
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [ jk ];
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-mute-filter.nix b/pkgs/applications/video/obs-studio/plugins/obs-mute-filter.nix
index b235ca6fb20b..c8c480a8bb7b 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-mute-filter.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-mute-filter.nix
@@ -32,9 +32,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/norihiro/obs-mute-filter";
     maintainers = with maintainers; [ flexiondotorg ];
     license = licenses.gpl2Plus;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-noise.nix b/pkgs/applications/video/obs-studio/plugins/obs-noise.nix
index f893de5f0200..fc481e57c4eb 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-noise.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-noise.nix
@@ -30,9 +30,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/FiniteSingularity/obs-noise";
     maintainers = with maintainers; [ flexiondotorg ];
     license = licenses.gpl2Only;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix
index 559d5db86cba..ec6ac2570b44 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix
@@ -42,9 +42,6 @@ stdenv.mkDerivation rec {
       fazzi
     ];
     license = licenses.gpl2Plus;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-retro-effects.nix b/pkgs/applications/video/obs-studio/plugins/obs-retro-effects.nix
index f953df7d1422..10e92ac5a8bd 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-retro-effects.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-retro-effects.nix
@@ -31,9 +31,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/FiniteSingularity/obs-retro-effects";
     maintainers = with maintainers; [ flexiondotorg ];
     license = licenses.gpl2Plus;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-rgb-levels.nix b/pkgs/applications/video/obs-studio/plugins/obs-rgb-levels.nix
index a176af8babb7..406e7b65986a 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-rgb-levels.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-rgb-levels.nix
@@ -25,9 +25,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/wimpysworld/obs-rgb-levels";
     maintainers = with maintainers; [ flexiondotorg ];
     license = licenses.gpl2Only;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix b/pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix
index 9dd74650681e..945e740063f6 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-scale-to-sound.nix
@@ -30,9 +30,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/dimtpap/obs-scale-to-sound";
     maintainers = with lib.maintainers; [ flexiondotorg ];
     license = lib.licenses.gpl2Plus;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-scene-as-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-scene-as-transition.nix
index d36b336a727c..f844c0f25499 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-scene-as-transition.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-scene-as-transition.nix
@@ -29,9 +29,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/andilippi/obs-scene-as-transition";
     maintainers = with maintainers; [ flexiondotorg ];
     license = licenses.gpl2Plus;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix
index ae4a77d246c8..31236c550e79 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix
@@ -40,9 +40,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/exeldro/obs-shaderfilter";
     maintainers = with maintainers; [ flexiondotorg ];
     license = licenses.gpl2Plus;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix b/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix
index eda617a1f353..811e43e921e2 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
       shackra
     ];
     license = licenses.gpl2Only;
-    platforms = [ "x86_64-linux" ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-source-switcher.nix b/pkgs/applications/video/obs-studio/plugins/obs-source-switcher.nix
index 9226d488536d..94be04736f23 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-source-switcher.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-source-switcher.nix
@@ -32,9 +32,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/exeldro/obs-source-switcher";
     maintainers = with lib.maintainers; [ flexiondotorg ];
     license = lib.licenses.gpl2Plus;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-stroke-glow-shadow.nix b/pkgs/applications/video/obs-studio/plugins/obs-stroke-glow-shadow.nix
index ca46be639993..f68a03f80736 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-stroke-glow-shadow.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-stroke-glow-shadow.nix
@@ -30,9 +30,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/FiniteSingularity/obs-stroke-glow-shadow";
     maintainers = with maintainers; [ flexiondotorg ];
     license = licenses.gpl2Only;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix b/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix
index 9efe37ea6d4d..61d203999ebc 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-text-pthread.nix
@@ -42,9 +42,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/norihiro/obs-text-pthread";
     maintainers = with maintainers; [ flexiondotorg ];
     license = licenses.gpl2Plus;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-transition-table.nix b/pkgs/applications/video/obs-studio/plugins/obs-transition-table.nix
index 097dbe334a83..f1e27d4327de 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-transition-table.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-transition-table.nix
@@ -35,9 +35,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/exeldro/obs-transition-table";
     maintainers = with maintainers; [ flexiondotorg ];
     license = licenses.gpl2Plus;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-urlsource.nix b/pkgs/applications/video/obs-studio/plugins/obs-urlsource.nix
index 0ced62150e21..e7f6abfbd38e 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-urlsource.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-urlsource.nix
@@ -90,9 +90,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/locaal-ai/obs-urlsource";
     maintainers = with maintainers; [ flexiondotorg ];
     license = licenses.gpl2Only;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix
index fdbb8bbafe3d..3abc131cab42 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix
@@ -66,9 +66,6 @@ stdenv.mkDerivation rec {
       pedrohlc
     ];
     license = lib.licenses.gpl2Plus;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix
index 2dd87819c346..fffbea3e20d9 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix
@@ -47,9 +47,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/Aitum/obs-vertical-canvas";
     maintainers = with lib.maintainers; [ flexiondotorg ];
     license = lib.licenses.gpl2Plus;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vintage-filter.nix b/pkgs/applications/video/obs-studio/plugins/obs-vintage-filter.nix
index 9a8967d67df8..9a25cc41b839 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-vintage-filter.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vintage-filter.nix
@@ -32,9 +32,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/cg2121/obs-vintage-filter";
     maintainers = with maintainers; [ flexiondotorg ];
     license = licenses.gpl2Plus;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix b/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix
index a3198dba06d6..6c67a1d6a3db 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-websocket.nix
@@ -42,9 +42,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/obsproject/obs-websocket";
     maintainers = with maintainers; [ flexiondotorg ];
     license = licenses.gpl2Plus;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/pixel-art.nix b/pkgs/applications/video/obs-studio/plugins/pixel-art.nix
index 95998d6b4500..12e70c21847c 100644
--- a/pkgs/applications/video/obs-studio/plugins/pixel-art.nix
+++ b/pkgs/applications/video/obs-studio/plugins/pixel-art.nix
@@ -25,9 +25,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/dspstanky/pixel-art";
     maintainers = with maintainers; [ flexiondotorg ];
     license = licenses.gpl2Only;
-    platforms = [
-      "x86_64-linux"
-      "i686-linux"
-    ];
+    inherit (obs-studio.meta) platforms;
   };
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/waveform/default.nix b/pkgs/applications/video/obs-studio/plugins/waveform/default.nix
index 1c432de77d5e..5439574f6421 100644
--- a/pkgs/applications/video/obs-studio/plugins/waveform/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/waveform/default.nix
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/phandasm/waveform";
     maintainers = with lib.maintainers; [ matthewcroughan ];
     license = lib.licenses.gpl3;
+    # Hard coded x86_64 support
     platforms = [ "x86_64-linux" ];
   };
 }

From 5beff2e759d7b9ddc3ddabaa2b40f81284ec7913 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Tue, 9 Sep 2025 21:51:26 -0700
Subject: [PATCH 02/25] obs-studio-plugins.input-overlay: fix building for
 aarch64

---
 .../video/obs-studio/plugins/input-overlay.nix     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix
index f818cf689cb1..d556e6838f57 100644
--- a/pkgs/applications/video/obs-studio/plugins/input-overlay.nix
+++ b/pkgs/applications/video/obs-studio/plugins/input-overlay.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
+  ninja,
   obs-studio,
   libuiohook,
   qtbase,
@@ -13,14 +14,14 @@
   SDL2,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "obs-input-overlay";
   version = "5.0.6";
 
   src = fetchFromGitHub {
     owner = "univrsal";
     repo = "input-overlay";
-    rev = "refs/tags/${version}";
+    tag = finalAttrs.version;
     hash = "sha256-ju4u7hhx+hTuq7Oh0DBPV8RRM8zqyyvYV74KymU0+2c=";
     fetchSubmodules = true;
   };
@@ -28,6 +29,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+    ninja
   ];
 
   buildInputs = [
@@ -47,7 +49,7 @@ stdenv.mkDerivation rec {
     libxkbfile
   ];
 
-  cmakeFlags = [
+  cmakeFlags = lib.optionals stdenv.hostPlatform.isx86 [
     "-DCMAKE_CXX_FLAGS=-msse4.1"
   ];
 
@@ -62,8 +64,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/univrsal/input-overlay";
     maintainers = with lib.maintainers; [ glittershark ];
     license = lib.licenses.gpl2;
-    platforms = lib.platforms.linux;
-    # never built on aarch64-linux since first introduction in nixpkgs
-    broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64;
+    inherit (obs-studio.meta) platforms;
   };
-}
+})

From 5dfc49b9c29b71438c892de801bcf495779c36e6 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Tue, 9 Sep 2025 21:55:28 -0700
Subject: [PATCH 03/25] obs-studio-plugins.obs-nvfb: remove due to glx removal

As stated on the README for obs-nvfb, OBS Studio v28 removed GLX
support. As we're on version 31.0.4, it's time we remove obs-nvfb. It
has not been maintained in 3 years and it looks like GLX support in OBS
Studio will not be coming back.
---
 .../video/obs-studio/plugins/default.nix      |  2 -
 .../video/obs-studio/plugins/obs-nvfbc.nix    | 43 -------------------
 2 files changed, 45 deletions(-)
 delete mode 100644 pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix

diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix
index b52c9f523d46..d0cc348da0ec 100644
--- a/pkgs/applications/video/obs-studio/plugins/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/default.nix
@@ -64,8 +64,6 @@
 
   obs-noise = callPackage ./obs-noise.nix { };
 
-  obs-nvfbc = callPackage ./obs-nvfbc.nix { };
-
   obs-pipewire-audio-capture = callPackage ./obs-pipewire-audio-capture.nix { };
 
   obs-recursion-effect = callPackage ./obs-recursion-effect.nix { };
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix b/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix
deleted file mode 100644
index f1120c7c255e..000000000000
--- a/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitLab,
-  meson,
-  ninja,
-  pkg-config,
-  obs-studio,
-  libGL,
-  libX11,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "obs-nvfbc";
-  version = "0.0.7";
-
-  src = fetchFromGitLab {
-    owner = "fzwoch";
-    repo = "obs-nvfbc";
-    rev = "v${version}";
-    hash = "sha256-AJ3K0O1vrixskn+/Tpg7LsgRO8N4sgDo1Y6gg3CwGVo=";
-  };
-
-  nativeBuildInputs = [
-    meson
-    pkg-config
-    ninja
-  ];
-  buildInputs = [
-    obs-studio
-    libGL
-    libX11
-  ];
-
-  meta = with lib; {
-    description = "OBS Studio source plugin for NVIDIA FBC API";
-    homepage = "https://gitlab.com/fzwoch/obs-nvfbc";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ babbaj ];
-    platforms = [ "x86_64-linux" ];
-    broken = true;
-  };
-}

From 5a2d3d44dfa863a806d9746eecf249bb16502fd1 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Tue, 9 Sep 2025 22:15:41 -0700
Subject: [PATCH 04/25] ndi-6: fix build

---
 pkgs/by-name/nd/ndi-6/package.nix  | 4 ++--
 pkgs/by-name/nd/ndi-6/version.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nd/ndi-6/package.nix b/pkgs/by-name/nd/ndi-6/package.nix
index 1e121b7e5764..4e1c0a2109c9 100644
--- a/pkgs/by-name/nd/ndi-6/package.nix
+++ b/pkgs/by-name/nd/ndi-6/package.nix
@@ -52,9 +52,9 @@ stdenv.mkDerivation rec {
       patchelf --set-rpath "${avahi}/lib:${stdenv.cc.libc}/lib" "$i"
     done
     rm $out/bin/libndi.so.${majorVersion}
-    ln -s $out/lib/libndi.so.${version} $out/bin/libndi.so.${majorVersion}
+    ln -s $out/lib/libndi.so $out/bin/libndi.so.${majorVersion}
     # Fake ndi version 5 for compatibility with DistroAV (obs plugin using NDI)
-    ln -s $out/lib/libndi.so.${version} $out/bin/libndi.so.5
+    ln -s $out/lib/libndi.so $out/bin/libndi.so.5
     mv include examples $out/
     mkdir -p $out/share/doc/ndi-6
     mv licenses $out/share/doc/ndi-6/licenses
diff --git a/pkgs/by-name/nd/ndi-6/version.json b/pkgs/by-name/nd/ndi-6/version.json
index 15f6b09389ef..edbc456e9e4a 100644
--- a/pkgs/by-name/nd/ndi-6/version.json
+++ b/pkgs/by-name/nd/ndi-6/version.json
@@ -1 +1 @@
-{"hash": "sha256-10pxvHLYbQ1p3NKSTC1I3YAFkPbYSCenXTEWukqy5TY=", "version": "6.2.0"}
+{"hash": "sha256-C99mJkUn+L43+iLt3SuFFLmGilik2D+AoH2+tHnuFNQ=", "version": "6.2.0"}

From 41e599f8b24edb312e6393260921d6e8ea1b6b31 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Sep 2025 00:31:25 +0000
Subject: [PATCH 05/25] ocamlPackages.uucp: 16.0.0 -> 17.0.0

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

diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix
index c1aeeeff5262..eb98b5c4337e 100644
--- a/pkgs/development/ocaml-modules/uucp/default.nix
+++ b/pkgs/development/ocaml-modules/uucp/default.nix
@@ -14,7 +14,7 @@
 
 let
   pname = "uucp";
-  version = "16.0.0";
+  version = "17.0.0";
   webpage = "https://erratique.ch/software/${pname}";
   minimalOCamlVersion = "4.03";
   doCheck = true;
@@ -30,7 +30,7 @@ else
 
     src = fetchurl {
       url = "${webpage}/releases/${pname}-${version}.tbz";
-      hash = "sha256-5//UGI4u3OROYdxtwz9K2vCTzYiN16mOyEFhUQWtgEQ=";
+      hash = "sha256-mSQtTn4DYa15pYWFt0J+/BEpJRaa+6uIKnifMV4Euhs=";
     };
 
     nativeBuildInputs = [

From 1e788edb892a8c6c00b3669f06db34e64e511352 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Mon, 15 Sep 2025 11:40:19 +0530
Subject: [PATCH 06/25] hyprlandPlugins.mkHyprlandPlugin: support finalAttrs
 through lib.extendMkDerivation

---
 .../hyprwm/hyprland-plugins/default.nix       | 34 +++++++++++++------
 .../hyprwm/hyprland-plugins/hy3.nix           |  6 ++--
 .../hyprwm/hyprland-plugins/hycov.nix         |  7 ++--
 .../hyprland-plugins/hypr-dynamic-cursors.nix |  3 +-
 .../hyprwm/hyprland-plugins/hyprgrass.nix     |  3 +-
 .../hyprland-plugins/hyprland-plugins.nix     |  4 +--
 .../hyprwm/hyprland-plugins/hyprspace.nix     |  3 +-
 .../hyprwm/hyprland-plugins/hyprsplit.nix     |  8 ++---
 8 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix
index 8cd3353bfcd1..1219059e4aad 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix
@@ -3,25 +3,37 @@
   lib,
   callPackage,
   pkg-config,
-}:
+  hyprland,
+}@topLevelArgs:
 let
-  mkHyprlandPlugin =
-    hyprland:
-    args@{ pluginName, ... }:
-    hyprland.stdenv.mkDerivation (
-      args
-      // {
+
+  mkHyprlandPlugin = lib.extendMkDerivation {
+    constructDrv = topLevelArgs.hyprland.stdenv.mkDerivation;
+
+    extendDrvArgs =
+      finalAttrs:
+      {
+        pluginName ? "",
+        nativeBuildInputs ? [ ],
+        buildInputs ? [ ],
+        hyprland ? topLevelArgs.hyprland,
+        ...
+      }@args:
+
+      {
         pname = "${pluginName}";
-        nativeBuildInputs = [ pkg-config ] ++ args.nativeBuildInputs or [ ];
-        buildInputs = [ hyprland ] ++ hyprland.buildInputs ++ (args.buildInputs or [ ]);
+        nativeBuildInputs = [ pkg-config ] ++ nativeBuildInputs;
+        buildInputs = [ hyprland ] ++ hyprland.buildInputs ++ buildInputs;
         meta = args.meta // {
           description = args.meta.description or "";
           longDescription =
             (args.meta.longDescription or "")
             + "\n\nPlugins can be installed via a plugin entry in the Hyprland NixOS or Home Manager options.";
+
+          platforms = args.meta.platforms or hyprland.meta.platforms or [ ];
         };
-      }
-    );
+      };
+  };
 
   plugins = lib.mergeAttrsList [
     { hy3 = import ./hy3.nix; }
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix
index ee519e9efb36..ce023efccb85 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix
@@ -6,14 +6,14 @@
   mkHyprlandPlugin,
   nix-update-script,
 }:
-mkHyprlandPlugin hyprland rec {
+mkHyprlandPlugin (finalAttrs: {
   pluginName = "hy3";
   version = "hl0.50.0";
 
   src = fetchFromGitHub {
     owner = "outfoxxed";
     repo = "hy3";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-1BTJSqkj+lkIry27HuqA5UB7uRqAUvGT7LAUDQhKjU0=";
   };
 
@@ -33,4 +33,4 @@ mkHyprlandPlugin hyprland rec {
       johnrtitor
     ];
   };
-}
+})
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix
index 38bcd12a7ffa..51da0e82573e 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix
@@ -1,20 +1,19 @@
 {
   lib,
   mkHyprlandPlugin,
-  hyprland,
   cmake,
   fetchFromGitHub,
   nix-update-script,
 }:
 
-mkHyprlandPlugin hyprland rec {
+mkHyprlandPlugin (finalAttrs: {
   pluginName = "hycov";
   version = "0.41.2.1";
 
   src = fetchFromGitHub {
     owner = "DreamMaoMao";
     repo = "hycov";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-NRnxbkuiq1rQ+uauo7D+CEe73iGqxsWxTQa+1SEPnXQ=";
   };
 
@@ -30,4 +29,4 @@ mkHyprlandPlugin hyprland rec {
     platforms = lib.platforms.linux;
     broken = true; # Doesn't work after Hyprland v0.41.2 https://gitee.com/DreamMaoMao/hycov/issues/IANYC8#note_31512295_link
   };
-}
+})
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix
index 27232ae5de20..acaaad39363c 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix
@@ -2,11 +2,10 @@
   lib,
   mkHyprlandPlugin,
   fetchFromGitHub,
-  hyprland,
   nix-update-script,
 }:
 
-mkHyprlandPlugin hyprland {
+mkHyprlandPlugin {
   pluginName = "hypr-dynamic-cursors";
   version = "0-unstable-2025-09-01";
 
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix
index 185525befa6f..b1bf74e06722 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix
@@ -1,7 +1,6 @@
 {
   lib,
   mkHyprlandPlugin,
-  hyprland,
   fetchFromGitHub,
   cmake,
   doctest,
@@ -11,7 +10,7 @@
   nix-update-script,
 }:
 
-mkHyprlandPlugin hyprland {
+mkHyprlandPlugin {
   pluginName = "hyprgrass";
   version = "0.8.2-unstable-2025-05-08";
 
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix
index 87a26aa42e7c..a6500e797698 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix
@@ -10,7 +10,6 @@ let
             lib,
             cmake,
             fetchFromGitHub,
-            hyprland,
             mkHyprlandPlugin,
           }:
           let
@@ -23,7 +22,7 @@ let
               hash = "sha256-XJJ+frO4NOxVkoSGc1Mag8ESumzx2FmVRspOgFlMqF8=";
             };
           in
-          mkHyprlandPlugin hyprland {
+          mkHyprlandPlugin {
             pluginName = name;
             inherit version;
 
@@ -34,7 +33,6 @@ let
               description = "Hyprland ${description} plugin";
               license = lib.licenses.bsd3;
               teams = [ lib.teams.hyprland ];
-              inherit (hyprland.meta) platforms;
             };
           }
         )
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix
index a8bd1bcae619..773aa38d0e53 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprspace.nix
@@ -1,12 +1,11 @@
 {
   lib,
   fetchFromGitHub,
-  hyprland,
   mkHyprlandPlugin,
   nix-update-script,
 }:
 
-mkHyprlandPlugin hyprland {
+mkHyprlandPlugin {
   pluginName = "hyprspace";
   version = "0-unstable-2025-07-16";
 
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
index 06b0f1e10ce7..241e77e17eb1 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix
@@ -2,19 +2,18 @@
   lib,
   meson,
   fetchFromGitHub,
-  hyprland,
   ninja,
   mkHyprlandPlugin,
   nix-update-script,
 }:
-mkHyprlandPlugin hyprland rec {
+mkHyprlandPlugin (finalAttrs: {
   pluginName = "hyprsplit";
   version = "0.50.1";
 
   src = fetchFromGitHub {
     owner = "shezdy";
     repo = "hyprsplit";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-D0zfdUJXBRnNMmv/5qW+X4FJJ3/+t7yQmwJFkBuEgck=";
   };
 
@@ -29,9 +28,8 @@ mkHyprlandPlugin hyprland rec {
     homepage = "https://github.com/shezdy/hyprsplit";
     description = "Hyprland plugin for awesome / dwm like workspaces";
     license = lib.licenses.bsd3;
-    inherit (hyprland.meta) platforms;
     maintainers = with lib.maintainers; [
       aacebedo
     ];
   };
-}
+})

From cc4daa3d28872192a585423e450c705617a13142 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Mon, 15 Sep 2025 11:02:30 +0000
Subject: [PATCH 07/25] hyprlandPlugins.hy3: hl0.50.0 -> hl0.51.0

---
 .../window-managers/hyprwm/hyprland-plugins/hy3.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix
index ce023efccb85..f302a5fec85f 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix
@@ -8,13 +8,13 @@
 }:
 mkHyprlandPlugin (finalAttrs: {
   pluginName = "hy3";
-  version = "hl0.50.0";
+  version = "0.51.0";
 
   src = fetchFromGitHub {
     owner = "outfoxxed";
     repo = "hy3";
-    tag = finalAttrs.version;
-    hash = "sha256-1BTJSqkj+lkIry27HuqA5UB7uRqAUvGT7LAUDQhKjU0=";
+    tag = "hl${finalAttrs.version}";
+    hash = "sha256-HjbofK4rSLkkUvOZHdoAY6kn7Ok2bXo14eOKr8hKRHE=";
   };
 
   nativeBuildInputs = [ cmake ];

From df5fa3c19e5553fe05dde6b53f423723efbb3973 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Mon, 15 Sep 2025 16:35:09 +0530
Subject: [PATCH 08/25] hyprland-plugins: 0.50.0 -> 0.51.0

---
 .../hyprwm/hyprland-plugins/hyprland-plugins.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix
index a6500e797698..1497950a082e 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix
@@ -13,13 +13,13 @@ let
             mkHyprlandPlugin,
           }:
           let
-            version = "0.50.0";
+            version = "0.51.0";
 
             hyprland-plugins-src = fetchFromGitHub {
               owner = "hyprwm";
               repo = "hyprland-plugins";
               tag = "v${version}";
-              hash = "sha256-XJJ+frO4NOxVkoSGc1Mag8ESumzx2FmVRspOgFlMqF8=";
+              hash = "sha256-6jAtMjnWq8kty/dpPbIKxIupUG+WAE2AKMIKhxdLYNo=";
             };
           in
           mkHyprlandPlugin {

From 8a67c5a5baafae948e19aaa5f757cd8aff369700 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Mon, 15 Sep 2025 23:00:00 +0530
Subject: [PATCH 09/25] hyprlandPlugins.hy3: fix update script pattern matching

---
 .../window-managers/hyprwm/hyprland-plugins/hy3.nix        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix
index f302a5fec85f..bf63c68cd440 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix
@@ -21,7 +21,12 @@ mkHyprlandPlugin (finalAttrs: {
 
   dontStrip = true;
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "hl(.*)"
+    ];
+  };
 
   meta = {
     homepage = "https://github.com/outfoxxed/hy3";

From 27bbe639ae20c89a081a4ab0d9f8e83ae9dd9e2d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 16 Sep 2025 00:48:18 +0000
Subject: [PATCH 10/25] codeberg-cli: 0.4.11 -> 0.5.0

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

diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix
index 1bee8bf937fe..a34f27b1b062 100644
--- a/pkgs/by-name/co/codeberg-cli/package.nix
+++ b/pkgs/by-name/co/codeberg-cli/package.nix
@@ -9,17 +9,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "codeberg-cli";
-  version = "0.4.11";
+  version = "0.5.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "Aviac";
     repo = "codeberg-cli";
     rev = "v${version}";
-    hash = "sha256-wf9Ve7focNBo6fGsjBQpTIx+DtxOo73AIQ9uoV8Q88Q=";
+    hash = "sha256-eTr+vkHHbUnUIli7PDEb/1abr2z2m0AZK8sTrkADaqM=";
   };
 
-  cargoHash = "sha256-LmLMTnNwxih5HcrMUmQpVdIVz4KeHxcOFtOrNqgGPkA=";
+  cargoHash = "sha256-/cPso8VGG7a1ODHLFMQ1Pyr6NA+7umY+Z2iCBJfIGdE=";
   nativeBuildInputs = [
     pkg-config
     installShellFiles

From 65b0da63a357fbf03de75f2dc1e0e6298f836d66 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Mon, 15 Sep 2025 18:25:56 -0700
Subject: [PATCH 11/25] llama-cpp: 6442 -> 6479

Includes fix for v_dot2_f32_f16 being used on ISAs without that instruction.

https://github.com/ggml-org/llama.cpp/pull/15927
---
 pkgs/by-name/ll/llama-cpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index c3ae8e1dc0c7..0b2f7c9b3a21 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -75,13 +75,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "6442";
+  version = "6479";
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-YNH7gvFtkHaZDnABg9pxJjnsASQfrRU4iqKqVa79MO8=";
+    hash = "sha256-wgfYjG9m/ainCI85FlCb12Dz01R+pZfFeDX613M4xpQ=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT

From 4196905d20a47a8cbe31473a2bc40a72a36be9b2 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 16 Sep 2025 03:14:38 +0100
Subject: [PATCH 12/25] libmusicbrainz: libmusicbrainz_3 -> libmusicbrainz_5

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e60748213ea..f042d1bac250 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8187,7 +8187,7 @@ with pkgs;
 
   libmusicbrainz5 = callPackage ../development/libraries/libmusicbrainz/5.x.nix { };
 
-  libmusicbrainz = libmusicbrainz3;
+  libmusicbrainz = libmusicbrainz5;
 
   libosmscout = libsForQt5.callPackage ../development/libraries/libosmscout { };
 

From 7ae890f16ea7f3b3b8e709da921d003b25a7379c Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 16 Sep 2025 03:15:29 +0100
Subject: [PATCH 13/25] libmusicbrainz3: drop

---
 .../libraries/libmusicbrainz/default.nix      | 40 -------------------
 .../libraries/libmusicbrainz/v3-darwin.patch  | 22 ----------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 4 files changed, 1 insertion(+), 64 deletions(-)
 delete mode 100644 pkgs/development/libraries/libmusicbrainz/default.nix
 delete mode 100644 pkgs/development/libraries/libmusicbrainz/v3-darwin.patch

diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix
deleted file mode 100644
index d5df1f113222..000000000000
--- a/pkgs/development/libraries/libmusicbrainz/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  cmake,
-  neon,
-  libdiscid,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libmusicbrainz";
-  version = "3.0.3";
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [
-    neon
-    libdiscid
-  ];
-
-  src = fetchurl {
-    url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/${pname}-${version}.tar.gz";
-    sha256 = "1i9qly13bwwmgj68vma766hgvsd1m75236haqsp9zgh5znlmkm3z";
-  };
-
-  patches = [
-    # Fix spacing around string literal for modern clang
-    ./v3-darwin.patch
-  ];
-
-  meta = with lib; {
-    homepage = "http://musicbrainz.org/doc/libmusicbrainz";
-    description = "MusicBrainz Client Library (3.x version)";
-    longDescription = ''
-      The libmusicbrainz (also known as mb_client or MusicBrainz Client
-      Library) is a development library geared towards developers who wish to
-      add MusicBrainz lookup capabilities to their applications.'';
-    platforms = platforms.all;
-    license = licenses.lgpl21;
-  };
-}
diff --git a/pkgs/development/libraries/libmusicbrainz/v3-darwin.patch b/pkgs/development/libraries/libmusicbrainz/v3-darwin.patch
deleted file mode 100644
index af97eaff1ed3..000000000000
--- a/pkgs/development/libraries/libmusicbrainz/v3-darwin.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/webservice.cpp b/src/webservice.cpp
-index 3a36167..df14812 100644
---- a/src/webservice.cpp
-+++ b/src/webservice.cpp
-@@ -184,7 +184,7 @@ WebService::get(const std::string &entity,
- 	if (!sess) 
- 		throw WebServiceError("ne_session_create() failed.");
- 	ne_set_server_auth(sess, httpAuth, this);
--	ne_set_useragent(sess, PACKAGE"/"VERSION);
-+	ne_set_useragent(sess, PACKAGE "/" VERSION);
- 	
- 	// Use proxy server
- 	if (!d->proxyHost.empty()) {
-@@ -269,7 +269,7 @@ WebService::post(const std::string &entity,
- 	if (!sess) 
- 		throw WebServiceError("ne_session_create() failed.");
- 	ne_set_server_auth(sess, httpAuth, this);
--	ne_set_useragent(sess, PACKAGE"/"VERSION);
-+	ne_set_useragent(sess, PACKAGE "/" VERSION);
- 
- 	// Use proxy server
- 	if (!d->proxyHost.empty()) {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5d903ac3ed8b..a4ccecbed5aa 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1314,6 +1314,7 @@ mapAliases {
   libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17
   liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17
   libmp3splt = throw "'libmp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17
+  libmusicbrainz3 = throw "libmusicbrainz3 has been removed as it was obsolete and unused"; # Added 2025-09-16
   libmx = throw "'libmx' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14
   libosmo-sccp = libosmo-sigtran; # Added 2024-12-20
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f042d1bac250..03f04766c314 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8183,8 +8183,6 @@ with pkgs;
 
   libmicrohttpd = libmicrohttpd_1_0;
 
-  libmusicbrainz3 = callPackage ../development/libraries/libmusicbrainz { };
-
   libmusicbrainz5 = callPackage ../development/libraries/libmusicbrainz/5.x.nix { };
 
   libmusicbrainz = libmusicbrainz5;

From bb35c2a6b7fccc90d3e02b24e76da2e3bbd7dd07 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 16 Sep 2025 03:15:56 +0100
Subject: [PATCH 14/25] treewide: libmusicbrainz5 -> libmusicbrainz

---
 pkgs/by-name/ca/cantata/package.nix      | 4 ++--
 pkgs/by-name/cy/cyanrip/package.nix      | 4 ++--
 pkgs/by-name/ne/nemo-preview/package.nix | 4 ++--
 pkgs/by-name/so/sound-juicer/package.nix | 4 ++--
 pkgs/kde/gear/libkcddb/default.nix       | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ca/cantata/package.nix b/pkgs/by-name/ca/cantata/package.nix
index 8671ce1e690f..52305fa26472 100644
--- a/pkgs/by-name/ca/cantata/package.nix
+++ b/pkgs/by-name/ca/cantata/package.nix
@@ -16,7 +16,7 @@
   withLame ? false,
   lame,
   withMusicbrainz ? false,
-  libmusicbrainz5,
+  libmusicbrainz,
 
   withTaglib ? true,
   taglib_1,
@@ -129,7 +129,7 @@ let
     {
       names = [ "MUSICBRAINZ" ];
       enable = withMusicbrainz;
-      pkgs = [ libmusicbrainz5 ];
+      pkgs = [ libmusicbrainz ];
     }
     {
       names = [ "ONLINE_SERVICES" ];
diff --git a/pkgs/by-name/cy/cyanrip/package.nix b/pkgs/by-name/cy/cyanrip/package.nix
index 2af30984eecc..0547ed7d6bf6 100644
--- a/pkgs/by-name/cy/cyanrip/package.nix
+++ b/pkgs/by-name/cy/cyanrip/package.nix
@@ -8,7 +8,7 @@
   ffmpeg-headless,
   libcdio,
   libcdio-paranoia,
-  libmusicbrainz5,
+  libmusicbrainz,
   curl,
 }:
 stdenv.mkDerivation (finalAttrs: {
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     ffmpeg-headless
     libcdio
     libcdio-paranoia
-    libmusicbrainz5
+    libmusicbrainz
     curl
   ];
 
diff --git a/pkgs/by-name/ne/nemo-preview/package.nix b/pkgs/by-name/ne/nemo-preview/package.nix
index 83d5742af99c..84223dcf99f9 100644
--- a/pkgs/by-name/ne/nemo-preview/package.nix
+++ b/pkgs/by-name/ne/nemo-preview/package.nix
@@ -10,7 +10,7 @@
   cjs,
   gtksourceview4,
   gobject-introspection,
-  libmusicbrainz5,
+  libmusicbrainz,
   webkitgtk_4_1,
   clutter-gtk,
   clutter-gst,
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     cjs
     gtksourceview4
-    libmusicbrainz5
+    libmusicbrainz
     webkitgtk_4_1
     clutter-gtk
     clutter-gst
diff --git a/pkgs/by-name/so/sound-juicer/package.nix b/pkgs/by-name/so/sound-juicer/package.nix
index 426ee4cfaa08..b949fdf00fa0 100644
--- a/pkgs/by-name/so/sound-juicer/package.nix
+++ b/pkgs/by-name/so/sound-juicer/package.nix
@@ -14,7 +14,7 @@
   gnome,
   adwaita-icon-theme,
   gst_all_1,
-  libmusicbrainz5,
+  libmusicbrainz,
   libdiscid,
   isocodes,
   gsettings-desktop-schemas,
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     libcanberra-gtk3
     adwaita-icon-theme
     gsettings-desktop-schemas
-    libmusicbrainz5
+    libmusicbrainz
     libdiscid
     isocodes
     gst_all_1.gstreamer
diff --git a/pkgs/kde/gear/libkcddb/default.nix b/pkgs/kde/gear/libkcddb/default.nix
index fea14f50c6e3..b0fb7d408b86 100644
--- a/pkgs/kde/gear/libkcddb/default.nix
+++ b/pkgs/kde/gear/libkcddb/default.nix
@@ -1,9 +1,9 @@
 {
   mkKdeDerivation,
-  libmusicbrainz5,
+  libmusicbrainz,
 }:
 mkKdeDerivation {
   pname = "libkcddb";
 
-  extraBuildInputs = [ libmusicbrainz5 ];
+  extraBuildInputs = [ libmusicbrainz ];
 }

From e5d6c617cf5673b6f66da328c46cde954047c672 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 16 Sep 2025 03:17:25 +0100
Subject: [PATCH 15/25] libmusicbrainz5: move to aliases

---
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a4ccecbed5aa..15adefb7b937 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1315,6 +1315,7 @@ mapAliases {
   liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17
   libmp3splt = throw "'libmp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17
   libmusicbrainz3 = throw "libmusicbrainz3 has been removed as it was obsolete and unused"; # Added 2025-09-16
+  libmusicbrainz5 = libmusicbrainz; # Added 2025-09-16
   libmx = throw "'libmx' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14
   libosmo-sccp = libosmo-sigtran; # Added 2024-12-20
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 03f04766c314..b4b71a3845d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8183,9 +8183,7 @@ with pkgs;
 
   libmicrohttpd = libmicrohttpd_1_0;
 
-  libmusicbrainz5 = callPackage ../development/libraries/libmusicbrainz/5.x.nix { };
-
-  libmusicbrainz = libmusicbrainz5;
+  libmusicbrainz = callPackage ../development/libraries/libmusicbrainz/5.x.nix { };
 
   libosmscout = libsForQt5.callPackage ../development/libraries/libosmscout { };
 

From 443539a91c246cbbf76cca57fdbb9cbb20b78be6 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 16 Sep 2025 03:18:10 +0100
Subject: [PATCH 16/25] libmusicbrainz: move to `by-name`

---
 .../5.x.nix => by-name/li/libmusicbrainz/package.nix}           | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/libmusicbrainz/5.x.nix => by-name/li/libmusicbrainz/package.nix} (100%)

diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/by-name/li/libmusicbrainz/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmusicbrainz/5.x.nix
rename to pkgs/by-name/li/libmusicbrainz/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4b71a3845d3..857018200432 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8183,8 +8183,6 @@ with pkgs;
 
   libmicrohttpd = libmicrohttpd_1_0;
 
-  libmusicbrainz = callPackage ../development/libraries/libmusicbrainz/5.x.nix { };
-
   libosmscout = libsForQt5.callPackage ../development/libraries/libosmscout { };
 
   libpeas = callPackage ../development/libraries/libpeas { };

From 8b2b6233df75ef979c82af5a9c8aaf238522ffda Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 16 Sep 2025 03:22:09 +0100
Subject: [PATCH 17/25] libmusicbrainz: 5.1.0 -> 5.1.0-unstable-2025-07-12

Last stable release in 2014, trickle of mundane fix commits since
then, including CMake 4 support. Try not to think about how long ago
the 3.x version was released, by the way.

Diff: https://github.com/metabrainz/libmusicbrainz/compare/release-5.1.0...4efbed3afae11ef68281816088d7cf3d0f704dfe
---
 pkgs/by-name/li/libmusicbrainz/package.nix | 44 ++++++++--------------
 1 file changed, 16 insertions(+), 28 deletions(-)

diff --git a/pkgs/by-name/li/libmusicbrainz/package.nix b/pkgs/by-name/li/libmusicbrainz/package.nix
index 8b6a622965c8..daf48ae5bd47 100644
--- a/pkgs/by-name/li/libmusicbrainz/package.nix
+++ b/pkgs/by-name/li/libmusicbrainz/package.nix
@@ -10,49 +10,37 @@
   pkg-config,
 }:
 
-stdenv.mkDerivation rec {
-  version = "5.1.0";
+stdenv.mkDerivation {
   pname = "libmusicbrainz";
+  version = "5.1.0-unstable-2025-07-12";
+
+  src = fetchFromGitHub {
+    owner = "metabrainz";
+    repo = "libmusicbrainz";
+    rev = "4efbed3afae11ef68281816088d7cf3d0f704dfe";
+    hash = "sha256-2nMm+vm/uOT7AzTQIvfpmBsNYApZF0mekDEgt7tC6fw=";
+  };
 
   nativeBuildInputs = [
     cmake
     pkg-config
   ];
+
   buildInputs = [
     neon
     libdiscid
     libxml2
   ];
 
-  src = fetchFromGitHub {
-    owner = "metabrainz";
-    repo = "libmusicbrainz";
-    sha256 = "0ah9kaf3g3iv1cps2vs1hs33nfbjfx1xscpjgxr1cg28p4ri6jhq";
-    rev = "release-${version}";
-  };
-
-  patches = [
-    # Fix build with libxml2 2.12
-    (fetchpatch {
-      url = "https://github.com/metabrainz/libmusicbrainz/commit/9ba00067a15479a52262a5126bcb6889da5884b7.patch";
-      hash = "sha256-4VxTohLpjUNnNZGIoRpBjUz71mLP3blg4oFL7itnJnY=";
-    })
-    (fetchpatch {
-      url = "https://github.com/metabrainz/libmusicbrainz/commit/558c9ba0e6d702d5c877f75be98176f57abf1b02.patch";
-      hash = "sha256-hKYY4BJLh/Real3NugLwzc4gPBQ3NB/F63iI/aV8Wh8=";
-    })
-  ];
-
-  dontUseCmakeBuildDir = true;
-
-  meta = with lib; {
+  meta = {
     homepage = "http://musicbrainz.org/doc/libmusicbrainz";
-    description = "MusicBrainz Client Library (5.x version)";
+    description = "MusicBrainz Client Library";
     longDescription = ''
       The libmusicbrainz (also known as mb_client or MusicBrainz Client
       Library) is a development library geared towards developers who wish to
-      add MusicBrainz lookup capabilities to their applications.'';
-    platforms = platforms.all;
-    license = licenses.lgpl21;
+      add MusicBrainz lookup capabilities to their applications.
+    '';
+    platforms = lib.platforms.all;
+    license = lib.licenses.lgpl21Plus;
   };
 }

From bfa1361ad136bc405a3a289aa37f3e7f3dc76af9 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 16 Sep 2025 03:51:29 +0100
Subject: [PATCH 18/25] freecell-solver: remove unused `libtap` dependency

It was replaced with cmocka.
---
 pkgs/by-name/fr/freecell-solver/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/fr/freecell-solver/package.nix b/pkgs/by-name/fr/freecell-solver/package.nix
index 5f9411e2febb..8c962bbb5155 100644
--- a/pkgs/by-name/fr/freecell-solver/package.nix
+++ b/pkgs/by-name/fr/freecell-solver/package.nix
@@ -6,7 +6,6 @@
   cmocka,
   gmp,
   gperf,
-  libtap,
   ninja,
   perl,
   pkg-config,
@@ -65,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     gmp
-    libtap
     rinutils
   ];
 

From 1d56920ef790267c99fd3d9262dfc6ffdc7c7236 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 16 Sep 2025 03:52:38 +0100
Subject: [PATCH 19/25] libtap: drop

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

diff --git a/pkgs/by-name/li/libtap/package.nix b/pkgs/by-name/li/libtap/package.nix
deleted file mode 100644
index 4b41187a7c9c..000000000000
--- a/pkgs/by-name/li/libtap/package.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  pkg-config,
-  cmake,
-  perl,
-}:
-
-stdenv.mkDerivation rec {
-
-  pname = "libtap";
-  version = "1.14.0";
-
-  src = fetchurl {
-    url = "https://web-cpan.shlomifish.org/downloads/${pname}-${version}.tar.xz";
-    sha256 = "1ga7rqmppa8ady665736cx443icscqlgflkqmxd4xbkzypmdj9bk";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  propagatedBuildInputs = [
-    cmake
-    perl
-  ];
-
-  meta = with lib; {
-    description = "Library to implement a test protocol";
-    longDescription = ''
-      libtap is a library to implement the Test Anything Protocol for
-      C originally created by Nik Clayton. This is a maintenance
-      branch by Shlomi Fish.
-    '';
-    homepage = "https://www.shlomifish.org/open-source/projects/libtap/";
-    license = licenses.bsd3;
-    maintainers = [ ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5d903ac3ed8b..d99bb9b6eee1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1342,6 +1342,7 @@ mapAliases {
   libsmartcols = lib.warnOnInstantiate "'util-linux' should be used instead of 'libsmartcols'" util-linux; # Added 2025-09-03
   libsoup = lib.warnOnInstantiate "'libsoup' has been renamed to 'libsoup_2_4'" libsoup_2_4; # Added 2024-12-02
   libstdcxx5 = throw "libstdcxx5 is severly outdated and has been removed"; # Added 2024-11-24
+  libtap = throw "libtap has been removed, as it was unused and deprecated by its author in favour of cmocka"; # Added 2025-09-16
   libtensorflow-bin = libtensorflow; # Added 2022-09-25
   libtorrent = throw "'libtorrent' has been renamed to 'libtorrent-rakshasa' for clearer distinction from 'libtorrent-rasterbar'"; # Added 2025-09-10
   libtorrentRasterbar = throw "'libtorrentRasterbar' has been renamed to/replaced by 'libtorrent-rasterbar'"; # Converted to throw 2024-10-17

From 5ec1665962fd5a7a3572a642e57c536a185712ee Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 16 Sep 2025 04:09:19 +0100
Subject: [PATCH 20/25] osm2xmap: drop

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

diff --git a/pkgs/by-name/os/osm2xmap/package.nix b/pkgs/by-name/os/osm2xmap/package.nix
deleted file mode 100644
index 292b4884711a..000000000000
--- a/pkgs/by-name/os/osm2xmap/package.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  libroxml,
-  proj_7,
-  yaml-cpp_0_3,
-  boost,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "osm2xmap";
-  version = "2.0";
-
-  src = fetchFromGitHub {
-    sha256 = "1d3f18wzk240yp0q8i2vskhcfj5ar61s4hw83vgps0wr2aglph3w";
-    repo = "osm2xmap";
-    owner = "sembruk";
-    rev = "v${version}";
-  };
-
-  makeFlags = [
-    "GIT_VERSION=${version}"
-    "GIT_TIMESTAMP="
-    "SHAREDIR=${placeholder "out"}/share/osm2xmap/"
-    "INSTALL_BINDIR=${placeholder "out"}/bin"
-    "INSTALL_MANDIR=${placeholder "out"}/share/man/man1"
-  ];
-
-  env.NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H";
-
-  buildInputs = [
-    libroxml
-    proj_7
-    yaml-cpp_0_3
-    boost
-  ];
-
-  meta = with lib; {
-    homepage = "https://github.com/sembruk/osm2xmap";
-    description = "Converter from OpenStreetMap data format to OpenOrienteering Mapper format";
-    license = licenses.gpl3;
-    maintainers = [ maintainers.mpickering ];
-    platforms = with lib.platforms; linux;
-    mainProgram = "osm2xmap";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5d903ac3ed8b..ebf5268a7f39 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1910,6 +1910,7 @@ mapAliases {
   oraclejdk8distro = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
   oraclejdk11 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
   OSCAR = oscar; # Added 2024-06-12
+  osm2xmap = throw "osm2xmap has been removed, as it is unmaintained upstream and depended on old dependencies with broken builds"; # Added 2025-09-16
   osxfuse = throw "'osxfuse' has been renamed to/replaced by 'macfuse-stubs'"; # Converted to throw 2024-10-17
   overrideSDK = "overrideSDK has been removed as it was a legacy compatibility stub. See <https://nixos.org/manual/nixpkgs/stable/#sec-darwin-legacy-frameworks-overrides> for migration instructions"; # Added 2025-08-04
   ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24

From 61b477f6726e915b19b33e445d20f33ff8a2b743 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 16 Sep 2025 04:10:10 +0100
Subject: [PATCH 21/25] proj_7: drop

---
 pkgs/development/libraries/proj/7.nix         | 76 -------------------
 .../libraries/proj/tests-sqlite-3.39.patch    | 13 ----
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 4 files changed, 1 insertion(+), 91 deletions(-)
 delete mode 100644 pkgs/development/libraries/proj/7.nix
 delete mode 100644 pkgs/development/libraries/proj/tests-sqlite-3.39.patch

diff --git a/pkgs/development/libraries/proj/7.nix b/pkgs/development/libraries/proj/7.nix
deleted file mode 100644
index 58b54feee0bf..000000000000
--- a/pkgs/development/libraries/proj/7.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  sqlite,
-  libtiff,
-  curl,
-  gtest,
-  fetchpatch,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "proj";
-  version = "7.2.1";
-
-  src = fetchFromGitHub {
-    owner = "OSGeo";
-    repo = "PROJ";
-    rev = version;
-    sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9";
-  };
-
-  patches = [
-    (fetchpatch {
-      # https://github.com/OSGeo/PROJ/issues/2557
-      name = "gie_self_tests-fail.diff"; # included in >= 8.0.1
-      url = "https://github.com/OSGeo/PROJ/commit/6f1a3c4648bf06862dca0b3725cbb3b7ee0284e3.diff";
-      sha256 = "0gapny0a9c3r0x9szjgn86sspjrrf4vwbija77b17w6ci5cq4pdf";
-    })
-    ./tests-sqlite-3.39.patch
-  ];
-
-  postPatch = lib.optionalString (version == "7.2.1") ''
-    substituteInPlace CMakeLists.txt \
-      --replace "MAJOR 7 MINOR 2 PATCH 0" "MAJOR 7 MINOR 2 PATCH 1"
-  '';
-
-  outputs = [
-    "out"
-    "dev"
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  buildInputs = [
-    sqlite
-    libtiff
-    curl
-  ];
-
-  nativeCheckInputs = [ gtest ];
-
-  cmakeFlags = [
-    "-DUSE_EXTERNAL_GTEST=ON"
-  ];
-  CXXFLAGS = [
-    # GCC 13: error: 'int64_t' in namespace 'std' does not name a type
-    "-include cstdint"
-  ];
-
-  doCheck = true;
-
-  meta = with lib; {
-    broken = true; # undefined reference to `TIFFReadEncodedStrip'
-    description = "Cartographic Projections Library";
-    homepage = "https://proj4.org";
-    license = licenses.mit;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ dotlambda ];
-  };
-}
diff --git a/pkgs/development/libraries/proj/tests-sqlite-3.39.patch b/pkgs/development/libraries/proj/tests-sqlite-3.39.patch
deleted file mode 100644
index 0654ff5eadb6..000000000000
--- a/pkgs/development/libraries/proj/tests-sqlite-3.39.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Drop tests that time out with newest sqlite.
-https://github.com/OSGeo/PROJ/issues/3254
-
---- a/test/cli/CMakeLists.txt
-+++ b/test/cli/CMakeLists.txt
-@@ -16 +15,0 @@
--proj_add_test_script_sh("testprojinfo" PROJINFO_BIN)
---- a/test/unit/CMakeLists.txt
-+++ b/test/unit/CMakeLists.txt
-@@ -144,3 +143,0 @@
--add_test(NAME proj_test_cpp_api COMMAND proj_test_cpp_api)
--set_property(TEST proj_test_cpp_api
--  PROPERTY ENVIRONMENT ${PROJ_TEST_ENVIRONMENT})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ebf5268a7f39..de21703fc4b1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2069,6 +2069,7 @@ mapAliases {
   private-gpt = throw "'private-gpt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2025-07-28
   probe-rs = probe-rs-tools; # Added 2024-05-23
   probe-run = throw "probe-run is deprecated upstream.  Use probe-rs instead."; # Added 2024-05-23
+  proj_7 = throw "proj_7 has been removed, as it was broken and unused"; # Added 2025-09-16
   prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31
   prometheus-dovecot-exporter = dovecot_exporter; # Added 2024-06-10
   prometheus-openldap-exporter = throw "'prometheus-openldap-exporter' has been removed from nixpkgs, as it was unmaintained"; # Added 2024-09-01
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e60748213ea..e1e0bed5e8a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8641,8 +8641,6 @@ with pkgs;
 
   proj = callPackage ../development/libraries/proj { };
 
-  proj_7 = callPackage ../development/libraries/proj/7.nix { };
-
   prospector = callPackage ../development/tools/prospector { };
 
   protobuf = protobuf_32;

From 5fc1d4322e3ea2374c0a9e3e04aee33af2c7fdf2 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 16 Sep 2025 04:11:34 +0100
Subject: [PATCH 22/25] proj: move to `by-name`

---
 .../pr}/proj/only-add-curl-for-static-builds.patch              | 0
 .../libraries/proj/default.nix => by-name/pr/proj/package.nix}  | 0
 pkgs/{development/libraries => by-name/pr}/proj/tests.nix       | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 4 files changed, 2 deletions(-)
 rename pkgs/{development/libraries => by-name/pr}/proj/only-add-curl-for-static-builds.patch (100%)
 rename pkgs/{development/libraries/proj/default.nix => by-name/pr/proj/package.nix} (100%)
 rename pkgs/{development/libraries => by-name/pr}/proj/tests.nix (100%)

diff --git a/pkgs/development/libraries/proj/only-add-curl-for-static-builds.patch b/pkgs/by-name/pr/proj/only-add-curl-for-static-builds.patch
similarity index 100%
rename from pkgs/development/libraries/proj/only-add-curl-for-static-builds.patch
rename to pkgs/by-name/pr/proj/only-add-curl-for-static-builds.patch
diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/by-name/pr/proj/package.nix
similarity index 100%
rename from pkgs/development/libraries/proj/default.nix
rename to pkgs/by-name/pr/proj/package.nix
diff --git a/pkgs/development/libraries/proj/tests.nix b/pkgs/by-name/pr/proj/tests.nix
similarity index 100%
rename from pkgs/development/libraries/proj/tests.nix
rename to pkgs/by-name/pr/proj/tests.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1e0bed5e8a7..158a68831710 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8639,8 +8639,6 @@ with pkgs;
     utils = true;
   };
 
-  proj = callPackage ../development/libraries/proj { };
-
   prospector = callPackage ../development/tools/prospector { };
 
   protobuf = protobuf_32;

From a7b76dbe5a0b0df38c159df72fcf9e9ecf4731a8 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 16 Sep 2025 04:12:13 +0100
Subject: [PATCH 23/25] yaml-cpp_0_3: drop

---
 pkgs/development/libraries/yaml-cpp/0.3.0.nix | 39 -------------------
 pkgs/top-level/aliases.nix                    |  3 +-
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 pkgs/development/libraries/yaml-cpp/0.3.0.nix

diff --git a/pkgs/development/libraries/yaml-cpp/0.3.0.nix b/pkgs/development/libraries/yaml-cpp/0.3.0.nix
deleted file mode 100644
index e1103c33a036..000000000000
--- a/pkgs/development/libraries/yaml-cpp/0.3.0.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "yaml-cpp";
-  version = "0.3.0";
-
-  src = fetchFromGitHub {
-    owner = "jbeder";
-    repo = "yaml-cpp";
-    rev = "release-${version}";
-    hash = "sha256-pmgcULTXhl83+Wc8ZsGebnJ1t0XybHhUEJxDnEZE5x8=";
-  };
-
-  strictDeps = true;
-
-  nativeBuildInputs = [
-    cmake
-  ];
-
-  cmakeFlags = [
-    "-DYAML_CPP_BUILD_TOOLS=${lib.boolToString doCheck}"
-    "-DBUILD_SHARED_LIBS=${lib.boolToString (!stdenv.hostPlatform.isStatic)}"
-  ];
-
-  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
-
-  meta = with lib; {
-    description = "YAML parser and emitter for C++";
-    homepage = "https://github.com/jbeder/yaml-cpp";
-    license = licenses.mit;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ OPNA2608 ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index de21703fc4b1..2bb8e830460b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1352,8 +1352,6 @@ mapAliases {
   libvpx_1_8 = throw "libvpx_1_8 has been removed because it is impacted by security issues and not used in nixpkgs, move to 'libvpx'"; # Added 2024-07-26
   libwnck3 = libwnck; # Added 2021-06-23
   libxplayer-plparser = throw "libxplayer-plparser has been removed as the upstream project was archived"; # Added 2024-12-27
-  libyamlcpp = yaml-cpp; # Added 2023-01-29
-  libyamlcpp_0_3 = yaml-cpp_0_3; # Added 2023-01-29
   libzapojit = throw "'libzapojit' has been removed due to lack of upstream maintenance and archival"; # Added 2025-04-16
   licensor = throw "'licensor' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01
@@ -2657,6 +2655,7 @@ mapAliases {
   ### Y ###
 
   yacc = throw "'yacc' has been renamed to/replaced by 'bison'"; # Converted to throw 2024-10-17
+  yaml-cpp_0_3 = throw "yaml-cpp_0_3 has been removed, as it was unused"; # Added 2025-09-16
   yesplaymusic = throw "YesPlayMusic has been removed as it was broken, unmaintained, and used deprecated Node and Electron versions"; # Added 2024-12-13
   yafaray-core = libyafaray; # Added 2022-09-23
   yandex-browser = throw "'yandex-browser' has been removed, as it was broken and unmaintained"; # Added 2025-04-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 158a68831710..d427348761af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8327,8 +8327,6 @@ with pkgs;
 
   yaml-cpp = callPackage ../development/libraries/yaml-cpp { };
 
-  yaml-cpp_0_3 = callPackage ../development/libraries/yaml-cpp/0.3.0.nix { };
-
   liquid-dsp = callPackage ../development/libraries/liquid-dsp {
     inherit (darwin) autoSignDarwinBinariesHook;
   };

From b214834cb4356d56964a6e822cd1b89de63731f3 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 16 Sep 2025 04:13:27 +0100
Subject: [PATCH 24/25] yaml-cpp: move to `by-name`

---
 .../yaml-cpp/default.nix => by-name/ya/yaml-cpp/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/yaml-cpp/default.nix => by-name/ya/yaml-cpp/package.nix} (100%)

diff --git a/pkgs/development/libraries/yaml-cpp/default.nix b/pkgs/by-name/ya/yaml-cpp/package.nix
similarity index 100%
rename from pkgs/development/libraries/yaml-cpp/default.nix
rename to pkgs/by-name/ya/yaml-cpp/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d427348761af..f5de26e22bf6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8325,8 +8325,6 @@ with pkgs;
 
   libwpe-fdo = callPackage ../development/libraries/libwpe/fdo.nix { };
 
-  yaml-cpp = callPackage ../development/libraries/yaml-cpp { };
-
   liquid-dsp = callPackage ../development/libraries/liquid-dsp {
     inherit (darwin) autoSignDarwinBinariesHook;
   };

From 798a52c35c680c65fa509091da68da7c8a036e55 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 16 Sep 2025 04:14:46 +0100
Subject: [PATCH 25/25] yaml-cpp: backport patch for CMake 4

---
 pkgs/by-name/ya/yaml-cpp/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ya/yaml-cpp/package.nix b/pkgs/by-name/ya/yaml-cpp/package.nix
index 75941866b604..fcc02c77bd14 100644
--- a/pkgs/by-name/ya/yaml-cpp/package.nix
+++ b/pkgs/by-name/ya/yaml-cpp/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   gitUpdater,
   cmake,
   static ? stdenv.hostPlatform.isStatic,
@@ -18,6 +19,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-J87oS6Az1/vNdyXu3L7KmUGWzU0IAkGrGMUUha+xDXI=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "yaml-cpp-fix-cmake-4.patch";
+      url = "https://github.com/jbeder/yaml-cpp/commit/c2680200486572baf8221ba052ef50b58ecd816e.patch";
+      hash = "sha256-1kXRa+xrAbLEhcJxNV1oGHPmayj1RNIe6dDWXZA3mUA=";
+    })
+  ];
+
   strictDeps = true;
 
   nativeBuildInputs = [