diff --git a/pkgs/by-name/pa/papilo/package.nix b/pkgs/by-name/pa/papilo/package.nix index 2e9e6b348de1..1813f0a236a1 100644 --- a/pkgs/by-name/pa/papilo/package.nix +++ b/pkgs/by-name/pa/papilo/package.nix @@ -1,37 +1,48 @@ { - blas, - boost, - cmake, - fetchFromGitHub, - gfortran12, lib, stdenv, - tbb, - zlib, + fetchFromGitHub, + cmake, + boost, + tbb_2022_0, }: stdenv.mkDerivation (finalAttrs: { pname = "papilo"; - version = "2.3.0"; + version = "2.4.2"; src = fetchFromGitHub { owner = "scipopt"; repo = "papilo"; - rev = "v${finalAttrs.version}"; - hash = "sha256-rB8kRyBxd+zn3XFueTQoN16jbFpXMvneqatQm8Hh2Hg="; + tag = "v${finalAttrs.version}"; + hash = "sha256-/1AsAesUh/5YXeCU2OYopoG3SXAwAecPD88QvGkb2bY="; }; - buildInputs = [ - blas - boost - cmake - gfortran12 - zlib - ]; + # skip SEGFAULT tests + postPatch = + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace test/CMakeLists.txt \ + --replace-fail '"matrix-buffer"' "" \ + --replace-fail '"vector-comparisons"' "" \ + --replace-fail '"matrix-comparisons"' "" \ + --replace-fail '"presolve-activity-is-updated-correctly-huge-values"' "" \ + --replace-fail '"problem-comparisons"' "" \ + --replace-fail "Boost_IOSTREAMS_FOUND" "FALSE" + '' + + (lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' + substituteInPlace test/CMakeLists.txt \ + --replace-fail '"happy-path-replace-variable"' "" + ''); nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ tbb ]; + buildInputs = [ + boost + cmake + tbb_2022_0 + ]; + + propagatedBuildInputs = [ tbb_2022_0 ]; strictDeps = true;