diff options
author | Domen Kožar <domen@dev.si> | 2021-11-09 22:58:55 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-09 22:58:55 -0600 |
commit | 9307bb15a7ffe5e25732922b66eba4213a85ae84 (patch) | |
tree | ff48d92cfc5e10764ca9a7af3608c59eefaac81e /pkgs/development/libraries/physics | |
parent | b4f7c6742cd6db82e85c8d543da6fa124def593a (diff) | |
parent | 14bbc387a9fffe6e58515119168d6d3f0453c141 (diff) |
Merge pull request #145096 from veprbl/pr/fastnlo_toolkit_zhf_2111
fastnlo_toolkit: fix on darwin
Diffstat (limited to 'pkgs/development/libraries/physics')
-rw-r--r-- | pkgs/development/libraries/physics/fastnlo_toolkit/default.nix | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix index fae2ff5a0f222..d9e88c4293ac3 100644 --- a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix +++ b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix @@ -1,7 +1,6 @@ { lib , stdenv -, fetchFromGitLab -, autoreconfHook +, fetchurl , boost , gfortran , lhapdf @@ -14,28 +13,14 @@ , withPython ? false }: -let - tag = "2823"; -in - stdenv.mkDerivation rec { pname = "fastnlo_toolkit"; - version = "2.5.0pre-${tag}"; - - src = fetchFromGitLab { - domain = "gitlab.etp.kit.edu"; - owner = "qcd-public"; - repo = "fastNLO"; - rev = tag; - hash = "sha256-FEKnEnK90tT4BJJ6MLva9lCl3aYzO1YGdx/8Ol2vM7M="; - } + /v2.5/toolkit; - - postPatch = '' - # remove duplicate macro, to fix for autoconf 2.70 - sed -e '0,/AC_CONFIG_MACRO_DIR\([m4]\)/{/AC_CONFIG_MACRO_DIR/d}' -i configure.ac - ''; + version = "2.5.0-2826"; - nativeBuildInputs = [ autoreconfHook ]; + src = fetchurl { + url = "https://fastnlo.hepforge.org/code/v25/fastnlo_toolkit-${version}.tar.gz"; + sha256 = "sha256-7aIMYCOkHC/17CHYiEfrxvtSJxTDivrS7BQ32cGiEy0="; + }; buildInputs = [ boost @@ -53,6 +38,10 @@ stdenv.mkDerivation rec { preConfigure = '' substituteInPlace ./fastnlotoolkit/Makefile.in \ --replace "-fext-numeric-literals" "" + + # disable test that fails due to strict floating-point number comparison + echo "#!/usr/bin/env perl" > check/fnlo-tk-stattest.pl.in + chmod +x check/fnlo-tk-stattest.pl.in ''; configureFlags = [ @@ -88,6 +77,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ veprbl ]; platforms = platforms.unix; - broken = stdenv.isAarch64; # failing test "fnlo-tk-stattest.pl" }; } |