ripser: 1.0.0 -> 1.2.1

https://github.com/Ripser/ripser/releases/tag/v1.0.1
https://github.com/Ripser/ripser/releases/tag/v1.1
https://github.com/Ripser/ripser/releases/tag/v1.2
https://github.com/Ripser/ripser/releases/tag/v1.2.1

authored by

Thomas Gerbet and committed by
Jonathan Ringer
1ba72de3 f73cc9cb

+5 -14
+5 -14
pkgs/applications/science/math/ripser/default.nix
··· 1 - { lib, stdenv, fetchurl, fetchFromGitHub 2 - , assembleReductionMatrix ? false 1 + { lib, stdenv, fetchFromGitHub 3 2 , useCoefficients ? false 4 3 , indicateProgress ? false 5 4 , useGoogleHashmap ? false, sparsehash ? null ··· 14 13 15 14 let 16 15 inherit (lib) optional; 17 - version = "1.0"; 16 + version = "1.2.1"; 18 17 in 19 18 stdenv.mkDerivation { 20 19 pname = "ripser"; ··· 23 22 src = fetchFromGitHub { 24 23 owner = "Ripser"; 25 24 repo = "ripser"; 26 - rev = "f69c6af6ca6883dd518c48faf41cf8901c379598"; 27 - sha256 = "1mw2898s7l29hgajsaf75bs9bjn2sn4g2mvmh41a602jpwp9r0rz"; 25 + rev = "v${version}"; 26 + sha256 = "sha256-BxmkPQ/nl5cF+xwQMTjXnLgkLgdmT/39y7Kzl2wDfpE="; 28 27 }; 29 28 30 - #Patch from dev branch to make compilation work. 31 - #Will be removed when it gets merged into master. 32 - patches = [(fetchurl { 33 - url = "https://github.com/Ripser/ripser/commit/dc78d8ce73ee35f3828f0aad67a4e53620277ebf.patch"; 34 - sha256 = "1y93aqpqz8fm1cxxrf90dhh67im3ndkr8dnxgbw5y96296n4r924"; 35 - })]; 36 - 37 29 buildInputs = optional useGoogleHashmap sparsehash; 38 30 39 31 buildFlags = [ 40 32 "-std=c++11" 41 - "-Ofast" 33 + "-O3" 42 34 "-D NDEBUG" 43 35 ] 44 - ++ optional assembleReductionMatrix "-D ASSEMBLE_REDUCTION_MATRIX" 45 36 ++ optional useCoefficients "-D USE_COEFFICIENTS" 46 37 ++ optional indicateProgress "-D INDICATE_PROGRESS" 47 38 ++ optional useGoogleHashmap "-D USE_GOOGLE_HASHMAP"