Unverified Commit a5b08dfb authored by Yueh-Shun Li's avatar Yueh-Shun Li Committed by GitHub
Browse files

vigra: 1.12.1 -> 1.12.2 (#438583)

parents 3e7cea45 eb60a3b5

maintainers/maintainer-list.nix

+5 −0
Original line number Diff line number Diff line
@@ -14026,6 +14026,11 @@ 
    githubId = 2422454;

    name = "Kai Wohlfahrt";

  };

  kyehn = {

    name = "kyehn";

    github = "kyehn";

    githubId = 228304369;

  };

  kylecarbs = {

    name = "Kyle Carberry";

    email = "kyle@carberry.com";

pkgs/development/libraries/vigra/default.nix

+16 −12
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ 
  libtiff,

  openexr,

  python3,

  writeShellScript,

  jq,

  nix-update,

}:



let
@@ -19,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
@@ -69,14 +66,21 @@ 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; {

  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

      kyehn

    ];

    platforms = lib.platforms.unix;

  };

})

pkgs/development/libraries/vigra/fix-llvm-19-1.patch

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
From c04362c082f35e87afbc9441dd2b3821de179055 Mon Sep 17 00:00:00 2001

From: Lukas N Wirz <lnwirz@chem.helsinki.fi>

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<N, HANDLES, 0>

     CoupledScanOrderIterator operator--(int)

     {

         CoupledScanOrderIterator res(*this);

-        --this;

+        std::advance(this, -1);

         return res;

     }

pkgs/development/libraries/vigra/fix-llvm-19-2.patch

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
From 191c09c2b086e1b0ab0ca1088e48e35fe492c620 Mon Sep 17 00:00:00 2001

From: Lukas N Wirz <lnwirz@chem.helsinki.fi>

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<N, HANDLES, 0>

     CoupledScanOrderIterator operator--(int)

     {

         CoupledScanOrderIterator res(*this);

-        std::advance(this, -1);

+        std::advance(*this, -1);

         return res;

     }