From 3e4f2f4f51bd2e6c07d304b5f46247b6fb8a00f8 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 29 Jul 2021 11:49:32 -0400 Subject: [PATCH 1/3] fastnlo_toolkit: 2.3.1pre-2411 -> 2.5.0pre-2823 --- .../physics/fastnlo_toolkit/default.nix | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix index e4a731d3172..c6de477953d 100644 --- a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix +++ b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab , autoreconfHook , boost , gfortran @@ -15,17 +15,23 @@ stdenv.mkDerivation rec { pname = "fastnlo_toolkit"; - version = "2.3.1pre-2411"; + rev = "2823"; + version = "2.5.0pre-${rev}"; - src = fetchurl { - urls = [ - "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz" - "https://sid.ethz.ch/debian/fastnlo/${pname}-${version}.tar.gz" - ]; - sha256 = "0fm9k732pmi3prbicj2yaq815nmcjll95fagjqzf542ng3swpqnb"; - }; + src = fetchFromGitLab { + domain = "gitlab.etp.kit.edu"; + owner = "qcd-public"; + repo = "fastNLO"; + inherit rev; + hash = "sha256-FEKnEnK90tT4BJJ6MLva9lCl3aYzO1YGdx/8Ol2vM7M="; + } + /v2.5/toolkit; - nativeBuildInputs = lib.optional withPython autoreconfHook; + 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 + ''; + + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ boost From 32f2712625b845aaf4f457d60ff660b58315c38a Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 30 Jul 2021 20:36:32 -0400 Subject: [PATCH 2/3] fastnlo_toolkit: enable tests --- .../libraries/physics/fastnlo_toolkit/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix index c6de477953d..06370e1672d 100644 --- a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix +++ b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix @@ -6,6 +6,7 @@ , gfortran , lhapdf , ncurses +, perl , python ? null , swig , yoda @@ -57,6 +58,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + doCheck = true; + checkInputs = [ + perl + lhapdf.pdf_sets.CT10nlo + ]; + preCheck = '' + patchShebangs --build check + ''; + enableParallelChecking = false; + meta = with lib; { homepage = "http://fastnlo.hepforge.org"; description = "Fast pQCD calculations for hadron-induced processes"; @@ -74,5 +85,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ veprbl ]; platforms = platforms.unix; + broken = stdenv.isAarch64; # failing test "fnlo-tk-stattest.pl" }; } From a1a34f71dc47eea6fc4b282907c496cd9f505c2f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 8 Aug 2021 14:04:51 -0400 Subject: [PATCH 3/3] fastnlo_toolkit: refactor to not define rev as environment variable --- .../libraries/physics/fastnlo_toolkit/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix index 06370e1672d..fae2ff5a0f2 100644 --- a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix +++ b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix @@ -14,16 +14,19 @@ , withPython ? false }: +let + tag = "2823"; +in + stdenv.mkDerivation rec { pname = "fastnlo_toolkit"; - rev = "2823"; - version = "2.5.0pre-${rev}"; + version = "2.5.0pre-${tag}"; src = fetchFromGitLab { domain = "gitlab.etp.kit.edu"; owner = "qcd-public"; repo = "fastNLO"; - inherit rev; + rev = tag; hash = "sha256-FEKnEnK90tT4BJJ6MLva9lCl3aYzO1YGdx/8Ol2vM7M="; } + /v2.5/toolkit;