From a65acb53019972998e2d62970bcfbf45e2a3197c Mon Sep 17 00:00:00 2001 From: kyehn Date: Sun, 31 Aug 2025 07:24:37 +0800 Subject: [PATCH 1/5] vigra: add updateScript --- pkgs/development/libraries/vigra/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 7f73bf4eee89..fa49017c431b 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -12,6 +12,9 @@ libtiff, openexr, python3, + writeShellScript, + jq, + nix-update, }: let @@ -69,6 +72,10 @@ stdenv.mkDerivation (finalAttrs: { doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; }); }; + updateScript = writeShellScript "update-vigra" '' + latestVersion=$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} --fail --silent https://api.github.com/repos/ukoethe/vigra/releases/latest | ${lib.getExe jq} --raw-output .tag_name | sed -E 's/Version-([0-9]+)-([0-9]+)-([0-9]+)/\1.\2.\3/') + ${lib.getExe nix-update} vigra --version $latestVersion + ''; }; meta = with lib; { From 913de6a9babf35c083782c521f2001ded8aa1c3e Mon Sep 17 00:00:00 2001 From: kyehn Date: Sun, 31 Aug 2025 07:25:17 +0800 Subject: [PATCH 2/5] vigra: 1.12.1 -> 1.12.2 --- pkgs/development/libraries/vigra/default.nix | 10 ++------- .../libraries/vigra/fix-llvm-19-1.patch | 22 ------------------- .../libraries/vigra/fix-llvm-19-2.patch | 22 ------------------- 3 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 pkgs/development/libraries/vigra/fix-llvm-19-1.patch delete mode 100644 pkgs/development/libraries/vigra/fix-llvm-19-2.patch diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index fa49017c431b..04115bc7a536 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -22,21 +22,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vigra"; - version = "1.12.1"; + version = "1.12.2"; src = fetchFromGitHub { owner = "ukoethe"; repo = "vigra"; tag = "Version-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}"; - hash = "sha256-ZmHj1BSyoMBCuxI5hrRiBEb5pDUsGzis+T5FSX27UN8="; + hash = "sha256-E+O5NbDX1ycDJTht6kW8JzYnhEL6Wd1xp0rcLpdm2HQ="; }; - patches = [ - # Patches to fix compiling on LLVM 19 from https://github.com/ukoethe/vigra/pull/592 - ./fix-llvm-19-1.patch - ./fix-llvm-19-2.patch - ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ boost diff --git a/pkgs/development/libraries/vigra/fix-llvm-19-1.patch b/pkgs/development/libraries/vigra/fix-llvm-19-1.patch deleted file mode 100644 index 543f0752e84f..000000000000 --- a/pkgs/development/libraries/vigra/fix-llvm-19-1.patch +++ /dev/null @@ -1,22 +0,0 @@ -From c04362c082f35e87afbc9441dd2b3821de179055 Mon Sep 17 00:00:00 2001 -From: Lukas N Wirz -Date: Sat, 9 Nov 2024 23:15:40 +0200 -Subject: [PATCH] fix --this typo - ---- - include/vigra/multi_iterator_coupled.hxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/vigra/multi_iterator_coupled.hxx b/include/vigra/multi_iterator_coupled.hxx -index 6831dad5d..9e6ca3c62 100644 ---- a/include/vigra/multi_iterator_coupled.hxx -+++ b/include/vigra/multi_iterator_coupled.hxx -@@ -490,7 +490,7 @@ class CoupledScanOrderIterator - CoupledScanOrderIterator operator--(int) - { - CoupledScanOrderIterator res(*this); -- --this; -+ std::advance(this, -1); - return res; - } - diff --git a/pkgs/development/libraries/vigra/fix-llvm-19-2.patch b/pkgs/development/libraries/vigra/fix-llvm-19-2.patch deleted file mode 100644 index 92e730655fb7..000000000000 --- a/pkgs/development/libraries/vigra/fix-llvm-19-2.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 191c09c2b086e1b0ab0ca1088e48e35fe492c620 Mon Sep 17 00:00:00 2001 -From: Lukas N Wirz -Date: Sun, 10 Nov 2024 16:01:46 +0200 -Subject: [PATCH] typo - ---- - include/vigra/multi_iterator_coupled.hxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/vigra/multi_iterator_coupled.hxx b/include/vigra/multi_iterator_coupled.hxx -index 9e6ca3c62..1cb401897 100644 ---- a/include/vigra/multi_iterator_coupled.hxx -+++ b/include/vigra/multi_iterator_coupled.hxx -@@ -490,7 +490,7 @@ class CoupledScanOrderIterator - CoupledScanOrderIterator operator--(int) - { - CoupledScanOrderIterator res(*this); -- std::advance(this, -1); -+ std::advance(*this, -1); - return res; - } - From 94acab182af6c6624dc853e161ad56405c1df482 Mon Sep 17 00:00:00 2001 From: kyehn Date: Sun, 31 Aug 2025 07:25:45 +0800 Subject: [PATCH 3/5] vigra: remove with lib --- pkgs/development/libraries/vigra/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 04115bc7a536..a0d7b89a2e5e 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -72,12 +72,12 @@ stdenv.mkDerivation (finalAttrs: { ''; }; - meta = with lib; { + meta = { description = "Novel computer vision C++ library with customizable algorithms and data structures"; mainProgram = "vigra-config"; homepage = "https://hci.iwr.uni-heidelberg.de/vigra"; - license = licenses.mit; - maintainers = with maintainers; [ ShamrockLee ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ShamrockLee ]; + platforms = lib.platforms.unix; }; }) From b9aefa960eee38a8dfb549db5024757be86065db Mon Sep 17 00:00:00 2001 From: kyehn Date: Sun, 31 Aug 2025 10:06:08 +0800 Subject: [PATCH 4/5] maintainers: add kyehn --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d072e72875e8..c7d635db9d81 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14026,6 +14026,11 @@ githubId = 2422454; name = "Kai Wohlfahrt"; }; + kyehn = { + name = "kyehn"; + github = "kyehn"; + githubId = 228304369; + }; kylecarbs = { name = "Kyle Carberry"; email = "kyle@carberry.com"; From eb60a3b59a8926b4d70580cb93756c85f588b3c2 Mon Sep 17 00:00:00 2001 From: kyehn Date: Sun, 31 Aug 2025 10:08:22 +0800 Subject: [PATCH 5/5] vigra: add kyehn as maintainer --- pkgs/development/libraries/vigra/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index a0d7b89a2e5e..46d4965c105f 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -77,7 +77,10 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "vigra-config"; homepage = "https://hci.iwr.uni-heidelberg.de/vigra"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ ShamrockLee ]; + maintainers = with lib.maintainers; [ + ShamrockLee + kyehn + ]; platforms = lib.platforms.unix; }; })