From 29a144076ebfa1cf7523963d528240cf4a9e414c Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Tue, 21 Jan 2025 23:54:15 +0100 Subject: [PATCH] vigra: unstable-2022-01-11 -> 1.12.1 --- pkgs/development/libraries/vigra/default.nix | 10 +++------- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 34bd608de8e26..b988daafaa398 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -7,7 +7,6 @@ fftw, fftwSinglePrec, hdf5, - ilmbase, libjpeg, libpng, libtiff, @@ -20,24 +19,21 @@ let in stdenv.mkDerivation rec { pname = "vigra"; - version = "unstable-2022-01-11"; + version = "1.12.1"; src = fetchFromGitHub { owner = "ukoethe"; repo = "vigra"; - rev = "093d57d15c8c237adf1704d96daa6393158ce299"; - sha256 = "sha256-pFANoT00Wkh1/Dyd2x75IVTfyaoVA7S86tafUSr29Og="; + tag = "Version-${lib.replaceStrings [ "." ] [ "-" ] version}"; + hash = "sha256-ZmHj1BSyoMBCuxI5hrRiBEb5pDUsGzis+T5FSX27UN8="; }; - env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; - nativeBuildInputs = [ cmake ]; buildInputs = [ boost fftw fftwSinglePrec hdf5 - ilmbase libjpeg libpng libtiff diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7411f98dc38b0..78a3df2640b87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10777,6 +10777,7 @@ with pkgs; vigra = callPackage ../development/libraries/vigra { hdf5 = hdf5.override { usev110Api = true; }; + openexr = openexr_3; }; vte-gtk4 = vte.override {