public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #120524 from veprbl/pr/fastnlo_2411

Browse Source 
fastnlo_toolkit: 2.3.1pre-2402 -> 2.3.1pre-2411, enable python, rename
This commit is contained in:
Dmitry Kalinkin 2021-05-07 11:48:33 -04:00 committed by GitHub
commit d2e027aa44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkgs/development/libraries/physics/fastnlo/default.nix → pkgs/development/libraries/physics/fastnlo_toolkit/default.nix
View File

@ -1,38 +1,44 @@
{ lib { lib
, stdenv , stdenv
, fetchurl , fetchurl
, autoreconfHook
, boost , boost
, fastjet
, gfortran , gfortran
, lhapdf , lhapdf
, python2 , ncurses
, root , python
, swig
, yoda , yoda
, zlib , zlib
, withPython ? false
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fastnlo_toolkit"; pname = "fastnlo_toolkit";
version = "2.3.1pre-2402"; version = "2.3.1pre-2411";
src = fetchurl { src = fetchurl {
url = "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz"; urls = [
sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl"; "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz"
"https://sid.ethz.ch/debian/fastnlo/${pname}-${version}.tar.gz"
];
sha256 = "0fm9k732pmi3prbicj2yaq815nmcjll95fagjqzf542ng3swpqnb";
}; };
nativeBuildInputs = lib.optional withPython autoreconfHook;
buildInputs = [ buildInputs = [
boost boost
fastjet
gfortran gfortran
gfortran.cc.lib gfortran.cc.lib
lhapdf lhapdf
python2
root
yoda yoda
]; ] ++ lib.optional withPython python
++ lib.optional (withPython && python.isPy3k) ncurses;
propagatedBuildInputs = [ propagatedBuildInputs = [
zlib zlib
]; ] ++ lib.optional withPython swig;
preConfigure = '' preConfigure = ''
substituteInPlace ./fastnlotoolkit/Makefile.in \ substituteInPlace ./fastnlotoolkit/Makefile.in \
@ -41,7 +47,7 @@ stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--with-yoda=${yoda}" "--with-yoda=${yoda}"
]; ] ++ lib.optional withPython "--enable-pyext";
enableParallelBuilding = true; enableParallelBuilding = true;

1
pkgs/top-level/aliases.nix
View File

@ -195,6 +195,7 @@ mapAliases ({
exfat-utils = exfat; # 2015-09-11 exfat-utils = exfat; # 2015-09-11
facette = throw "facette has been removed."; # added 2020-01-06 facette = throw "facette has been removed."; # added 2020-01-06
fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # added 2020-03-28 fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # added 2020-03-28
fastnlo = fastnlo_toolkit; # added 2021-04-24
fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'."; # added 2021-04-13 fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'."; # added 2021-04-13
fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H."; fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H.";
ffadoFull = ffado; # added 2018-05-01 ffadoFull = ffado; # added 2018-05-01

2
pkgs/top-level/all-packages.nix
View File

@ -29717,7 +29717,7 @@ in
fastjet-contrib = callPackage ../development/libraries/physics/fastjet-contrib { }; fastjet-contrib = callPackage ../development/libraries/physics/fastjet-contrib { };
fastnlo = callPackage ../development/libraries/physics/fastnlo { }; fastnlo_toolkit = callPackage ../development/libraries/physics/fastnlo_toolkit { };
geant4 = libsForQt5.callPackage ../development/libraries/physics/geant4 { }; geant4 = libsForQt5.callPackage ../development/libraries/physics/geant4 { };

5
pkgs/top-level/python-packages.nix
View File

@ -2303,6 +2303,11 @@ in {
fastjsonschema = callPackage ../development/python-modules/fastjsonschema { }; fastjsonschema = callPackage ../development/python-modules/fastjsonschema { };
fastnlo_toolkit = toPythonModule (pkgs.fastnlo_toolkit.override {
withPython = true;
inherit python;
});
fastpair = callPackage ../development/python-modules/fastpair { }; fastpair = callPackage ../development/python-modules/fastpair { };
fastparquet = callPackage ../development/python-modules/fastparquet { }; fastparquet = callPackage ../development/python-modules/fastparquet { };