commit a5b08dfb1966c78064d73d2e1e76796bfd53d866 · pyrox.dev/nixpkgs

+5

maintainers/maintainer-list.nix

···

       14026
       14026
        
           githubId = 2422454;

     

       14027
       14027
        
           name = "Kai Wohlfahrt";

     

       14028
       14028
        
         };

     

       14029
       14029
       +
         kyehn = {

     

       14030
       14030
       +
           name = "kyehn";

     

       14031
       14031
       +
           github = "kyehn";

     

       14032
       14032
       +
           githubId = 228304369;

     

       14033
       14033
       +
         };

     

       14029
       14034
        
         kylecarbs = {

     

       14030
       14035
        
           name = "Kyle Carberry";

     

       14031
       14036
        
           email = "kyle@carberry.com";

+16 -12

pkgs/development/libraries/vigra/default.nix

···

       12
       12
        
         libtiff,

     

       13
       13
        
         openexr,

     

       14
       14
        
         python3,

     

       15
       15
       +
         writeShellScript,

     

       16
       16
       +
         jq,

     

       17
       17
       +
         nix-update,

     

       15
       18
        
       }:

     

       16
       19
        
       

     

       17
       20
        
       let

     
···

       19
       22
        
       in

     

       20
       23
        
       stdenv.mkDerivation (finalAttrs: {

     

       21
       24
        
         pname = "vigra";

     

       22
       22
       -
         version = "1.12.1";

     

       25
       25
       +
         version = "1.12.2";

     

       23
       26
        
       

     

       24
       27
        
         src = fetchFromGitHub {

     

       25
       28
        
           owner = "ukoethe";

     

       26
       29
        
           repo = "vigra";

     

       27
       30
        
           tag = "Version-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";

     

       28
       28
       -
           hash = "sha256-ZmHj1BSyoMBCuxI5hrRiBEb5pDUsGzis+T5FSX27UN8=";

     

       31
       31
       +
           hash = "sha256-E+O5NbDX1ycDJTht6kW8JzYnhEL6Wd1xp0rcLpdm2HQ=";

     

       29
       32
        
         };

     

       30
       30
       -
       

     

       31
       31
       -
         patches = [

     

       32
       32
       -
           # Patches to fix compiling on LLVM 19 from https://github.com/ukoethe/vigra/pull/592

     

       33
       33
       -
           ./fix-llvm-19-1.patch

     

       34
       34
       -
           ./fix-llvm-19-2.patch

     

       35
       35
       -
         ];

     

       36
       33
        
       

     

       37
       34
        
         nativeBuildInputs = [ cmake ];

     

       38
       35
        
         buildInputs = [

     
···

       69
       66
        
               doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;

     

       70
       67
        
             });

     

       71
       68
        
           };

     

       69
       69
       +
           updateScript = writeShellScript "update-vigra" ''

     

       70
       70
       +
             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/')

     

       71
       71
       +
             ${lib.getExe nix-update} vigra --version $latestVersion

     

       72
       72
       +
           '';

     

       72
       73
        
         };

     

       73
       74
        
       

     

       74
       74
       -
         meta = with lib; {

     

       75
       75
       +
         meta = {

     

       75
       76
        
           description = "Novel computer vision C++ library with customizable algorithms and data structures";

     

       76
       77
        
           mainProgram = "vigra-config";

     

       77
       78
        
           homepage = "https://hci.iwr.uni-heidelberg.de/vigra";

     

       78
       78
       -
           license = licenses.mit;

     

       79
       79
       -
           maintainers = with maintainers; [ ShamrockLee ];

     

       80
       80
       -
           platforms = platforms.unix;

     

       79
       79
       +
           license = lib.licenses.mit;

     

       80
       80
       +
           maintainers = with lib.maintainers; [

     

       81
       81
       +
             ShamrockLee

     

       82
       82
       +
             kyehn

     

       83
       83
       +
           ];

     

       84
       84
       +
           platforms = lib.platforms.unix;

     

       81
       85
        
         };

     

       82
       86
        
       })

-22

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

···

       1
       1
       -
       From c04362c082f35e87afbc9441dd2b3821de179055 Mon Sep 17 00:00:00 2001

     

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

     

       3
       3
       -
       Date: Sat, 9 Nov 2024 23:15:40 +0200

     

       4
       4
       -
       Subject: [PATCH] fix --this typo

     

       5
       5
       -
       

     

       6
       6
       -
       ---

     

       7
       7
       -
        include/vigra/multi_iterator_coupled.hxx | 2 +-

     

       8
       8
       -
        1 file changed, 1 insertion(+), 1 deletion(-)

     

       9
       9
       -
       

     

       10
       10
       -
       diff --git a/include/vigra/multi_iterator_coupled.hxx b/include/vigra/multi_iterator_coupled.hxx

     

       11
       11
       -
       index 6831dad5d..9e6ca3c62 100644

     

       12
       12
       -
       --- a/include/vigra/multi_iterator_coupled.hxx

     

       13
       13
       -
       +++ b/include/vigra/multi_iterator_coupled.hxx

     

       14
       14
       -
       @@ -490,7 +490,7 @@ class CoupledScanOrderIterator<N, HANDLES, 0>

     

       15
       15
       -
            CoupledScanOrderIterator operator--(int)

     

       16
       16
       -
            {

     

       17
       17
       -
                CoupledScanOrderIterator res(*this);

     

       18
       18
       -
       -        --this;

     

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

     

       20
       20
       -
                return res;

     

       21
       21
       -
            }

     

       22
       22
       -

-22

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

···

       1
       1
       -
       From 191c09c2b086e1b0ab0ca1088e48e35fe492c620 Mon Sep 17 00:00:00 2001

     

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

     

       3
       3
       -
       Date: Sun, 10 Nov 2024 16:01:46 +0200

     

       4
       4
       -
       Subject: [PATCH] typo

     

       5
       5
       -
       

     

       6
       6
       -
       ---

     

       7
       7
       -
        include/vigra/multi_iterator_coupled.hxx | 2 +-

     

       8
       8
       -
        1 file changed, 1 insertion(+), 1 deletion(-)

     

       9
       9
       -
       

     

       10
       10
       -
       diff --git a/include/vigra/multi_iterator_coupled.hxx b/include/vigra/multi_iterator_coupled.hxx

     

       11
       11
       -
       index 9e6ca3c62..1cb401897 100644

     

       12
       12
       -
       --- a/include/vigra/multi_iterator_coupled.hxx

     

       13
       13
       -
       +++ b/include/vigra/multi_iterator_coupled.hxx

     

       14
       14
       -
       @@ -490,7 +490,7 @@ class CoupledScanOrderIterator<N, HANDLES, 0>

     

       15
       15
       -
            CoupledScanOrderIterator operator--(int)

     

       16
       16
       -
            {

     

       17
       17
       -
                CoupledScanOrderIterator res(*this);

     

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

     

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

     

       20
       20
       -
                return res;

     

       21
       21
       -
            }

     

       22
       22
       -