git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #120524 from veprbl/pr/fastnlo_2411

fastnlo_toolkit: 2.3.1pre-2402 -> 2.3.1pre-2411, enable python, rename

commitd2e027aa445bc132c64c39354f5d6567f9520e2c authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateFri 7 May 2021, 11:48 (6 years ago) parent26e6a9df0c328e
4 files changed+25−13
pkgs/development/libraries/physics/fastnlo/default.nix → pkgs/development/libraries/physics/fastnlo_toolkit/default.nix+18−12 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+1−1 pkgs/top-level/python-packages.nix+5
pkgs/development/libraries/physics/fastnlo/default.nix → pkgs/development/libraries/physics/fastnlo_toolkit/default.nixrenamed+18−12
@@ -1,38 +1,44 @@
11{ lib
22, stdenv
33, fetchurl
4+, autoreconfHook
45, boost
5−, fastjet
66, gfortran
77, lhapdf
8−, python2
9−, root
8+, ncurses
9+, python
10+, swig
1011, yoda
1112, zlib
13+, withPython ? false
1214}:
1315
1416stdenv.mkDerivation rec {
1517 pname = "fastnlo_toolkit";
16− version = "2.3.1pre-2402";
18+ version = "2.3.1pre-2411";
1719
1820 src = fetchurl {
19− url = "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz";
20− sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl";
21+ urls = [
22+ "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz"
23+ "https://sid.ethz.ch/debian/fastnlo/${pname}-${version}.tar.gz"
24+ ];
25+ sha256 = "0fm9k732pmi3prbicj2yaq815nmcjll95fagjqzf542ng3swpqnb";
2126 };
2227
28+ nativeBuildInputs = lib.optional withPython autoreconfHook;
29+
2330 buildInputs = [
2431 boost
25− fastjet
2632 gfortran
2733 gfortran.cc.lib
2834 lhapdf
29− python2
30− root
3135 yoda
32− ];
36+ ] ++ lib.optional withPython python
37+ ++ lib.optional (withPython && python.isPy3k) ncurses;
38+
3339 propagatedBuildInputs = [
3440 zlib
35− ];
41+ ] ++ lib.optional withPython swig;
3642
3743 preConfigure = ''
3844 substituteInPlace ./fastnlotoolkit/Makefile.in \
@@ -41,7 +47,7 @@ stdenv.mkDerivation rec {
4147
4248 configureFlags = [
4349 "--with-yoda=${yoda}"
44− ];
50+ ] ++ lib.optional withPython "--enable-pyext";
4551
4652 enableParallelBuilding = true;
4753
pkgs/top-level/aliases.nix+1
@@ -195,6 +195,7 @@ mapAliases ({
195195 exfat-utils = exfat; # 2015-09-11
196196 facette = throw "facette has been removed."; # added 2020-01-06
197197 fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # added 2020-03-28
198+ fastnlo = fastnlo_toolkit; # added 2021-04-24
198199 fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'."; # added 2021-04-13
199200 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H.";
200201 ffadoFull = ffado; # added 2018-05-01
pkgs/top-level/all-packages.nix+1−1
@@ -29717,7 +29717,7 @@ in
2971729717
2971829718 fastjet-contrib = callPackage ../development/libraries/physics/fastjet-contrib { };
2971929719
29720− fastnlo = callPackage ../development/libraries/physics/fastnlo { };
29720+ fastnlo_toolkit = callPackage ../development/libraries/physics/fastnlo_toolkit { };
2972129721
2972229722 geant4 = libsForQt5.callPackage ../development/libraries/physics/geant4 { };
2972329723
pkgs/top-level/python-packages.nix+5
@@ -2303,6 +2303,11 @@ in {
23032303
23042304 fastjsonschema = callPackage ../development/python-modules/fastjsonschema { };
23052305
2306+ fastnlo_toolkit = toPythonModule (pkgs.fastnlo_toolkit.override {
2307+ withPython = true;
2308+ inherit python;
2309+ });
2310+
23062311 fastpair = callPackage ../development/python-modules/fastpair { };
23072312
23082313 fastparquet = callPackage ../development/python-modules/fastparquet { };