From d0fd6f83bbd6b5f23899dbfd3ab9226741d3965b Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 10 Jul 2026 16:32:27 -0500
Subject: [PATCH 1/3] vigra: move args out of top-level

---
 pkgs/development/libraries/vigra/default.nix | 5 ++++-
 pkgs/top-level/all-packages.nix              | 4 +---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index 14760defa896..0ecdf55075c5 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -32,11 +32,14 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [ cmake ];
+
   buildInputs = [
     boost
     fftw
     fftwSinglePrec
-    hdf5
+    (hdf5.override {
+      apiVersion = "v110";
+    })
     libjpeg
     libpng
     libtiff
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7d3cdd136f86..d7cacb8be599 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6828,9 +6828,7 @@ with pkgs;
     inherit (llvmPackages) openmp;
   };
 
-  vigra = callPackage ../development/libraries/vigra {
-    hdf5 = hdf5.override { apiVersion = "v110"; };
-  };
+  vigra = callPackage ../development/libraries/vigra { };
 
   vte-gtk4 = vte.override {
     gtkVersion = "4";

From b80bfae8d11a9d91f282de7763d011976dd302de Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 10 Jul 2026 16:54:22 -0500
Subject: [PATCH 2/3] vigra: add strictDeps and structuredAttrs

---
 pkgs/development/libraries/vigra/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index 0ecdf55075c5..c095fbf53c01 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -31,6 +31,9 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-pknZHHIIhjfOxdp+qCOOGvo0W5ByTHXRiIQzzN7Z6M4=";
   };
 
+  strictDeps = true;
+  __structuredAttrs = true;
+
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [

From a8c1bfc86cd7d2a8a76b068b5f623bd2a19472ea Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 10 Jul 2026 16:58:25 -0500
Subject: [PATCH 3/3] vigra: migrate to by-bane

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

diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/by-name/vi/vigra/package.nix
similarity index 100%
rename from pkgs/development/libraries/vigra/default.nix
rename to pkgs/by-name/vi/vigra/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7cacb8be599..64c6152c9fcb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6828,8 +6828,6 @@ with pkgs;
     inherit (llvmPackages) openmp;
   };
 
-  vigra = callPackage ../development/libraries/vigra { };
-
   vte-gtk4 = vte.override {
     gtkVersion = "4";
   };