From 48f7505b0705d8cfa18cc7faee1d8440b18f9103 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 23 Jan 2025 02:34:13 +0800 Subject: [PATCH 1/4] vigra: enableParallelBuilding = true --- pkgs/development/libraries/vigra/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index b988daafaa39..f68029b42855 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -51,6 +51,8 @@ stdenv.mkDerivation rec { "-DCMAKE_C_FLAGS=-fPIC" ]; + enableParallelBuilding = true; + meta = with lib; { description = "Novel computer vision C++ library with customizable algorithms and data structures"; mainProgram = "vigra-config"; From 2522475db0951082e3151263bc367175cab39b86 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 23 Jan 2025 20:08:53 +0800 Subject: [PATCH 2/4] vigra: use fixed-point arguments --- pkgs/development/libraries/vigra/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index f68029b42855..d500cc7579d7 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -17,14 +17,14 @@ let python = python3.withPackages (py: with py; [ numpy ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vigra"; version = "1.12.1"; src = fetchFromGitHub { owner = "ukoethe"; repo = "vigra"; - tag = "Version-${lib.replaceStrings [ "." ] [ "-" ] version}"; + tag = "Version-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}"; hash = "sha256-ZmHj1BSyoMBCuxI5hrRiBEb5pDUsGzis+T5FSX27UN8="; }; @@ -61,4 +61,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = platforms.unix; }; -} +}) From 4d356df875abb0be8cd7297773d48933bc26186d Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Wed, 22 Jan 2025 22:10:16 +0800 Subject: [PATCH 3/4] vigra: run upstream tests as tests.check --- pkgs/development/libraries/vigra/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index d500cc7579d7..b3b4ef750890 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -41,6 +41,11 @@ stdenv.mkDerivation (finalAttrs: { python ]; + postPatch = '' + chmod +x config/run_test.sh.in + patchShebangs --build config/run_test.sh.in + ''; + cmakeFlags = [ "-DWITH_OPENEXR=1" @@ -53,6 +58,14 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; + passthru = { + tests = { + check = finalAttrs.finalPackage.overrideAttrs (previousAttrs: { + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + }); + }; + }; + meta = with lib; { description = "Novel computer vision C++ library with customizable algorithms and data structures"; mainProgram = "vigra-config"; From fd78733bc5ee3371f4f239f2b232b48b62ae5f01 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 23 Jan 2025 20:17:52 +0800 Subject: [PATCH 4/4] vigra: add ShamrockLee as a maintainer --- pkgs/development/libraries/vigra/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index b3b4ef750890..18cb383651cf 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "vigra-config"; homepage = "https://hci.iwr.uni-heidelberg.de/vigra"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ ShamrockLee ]; platforms = platforms.unix; }; })