chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-12 02:40:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

vigra: 1.12.1 -> 1.12.2

Browse Source
This commit is contained in:
kyehn
2025-08-31 07:25:17 +08:00
parent a65acb5301
commit 913de6a9ba
3 changed files with 2 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/vigra/default.nix
View File

@@ -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

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

@@ -1,22 +0,0 @@
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;
}

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

@@ -1,22 +0,0 @@
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;
}