From 14bbc387a9fffe6e58515119168d6d3f0453c141 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 8 Nov 2021 19:15:18 -0500 Subject: [PATCH] fastnlo_toolkit: 2.5.0pre-2823 -> 2.5.0-2826 Since this comes with pre-generated files, this fixes the python extension. --- .../physics/fastnlo_toolkit/default.nix | 27 +++++-------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix index ce6ea561e271..d9e88c4293ac 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}"; + version = "2.5.0-2826"; - 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 - ''; - - nativeBuildInputs = [ autoreconfHook ]; + src = fetchurl { + url = "https://fastnlo.hepforge.org/code/v25/fastnlo_toolkit-${version}.tar.gz"; + sha256 = "sha256-7aIMYCOkHC/17CHYiEfrxvtSJxTDivrS7BQ32cGiEy0="; + }; buildInputs = [ boost