From 91cee86221bb3086ba0f602a6393080264171910 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 24 Apr 2021 08:30:33 -0400 Subject: [PATCH 1/4] fastnlo: rename to fastnlo_toolkit --- .../libraries/physics/{fastnlo => fastnlo_toolkit}/default.nix | 0 pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/development/libraries/physics/{fastnlo => fastnlo_toolkit}/default.nix (100%) diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix similarity index 100% rename from pkgs/development/libraries/physics/fastnlo/default.nix rename to pkgs/development/libraries/physics/fastnlo_toolkit/default.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 999c26e320bd..4e3ef5803440 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -193,6 +193,7 @@ mapAliases ({ exfat-utils = exfat; # 2015-09-11 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 + 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 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H."; ffadoFull = ffado; # added 2018-05-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76c68e6b3952..e0aef466b093 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29550,7 +29550,7 @@ in 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 { }; From dd5c76607882b5981e91e4cca86873d43763d615 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 24 Apr 2021 08:33:22 -0400 Subject: [PATCH 2/4] fastnlo_toolkit: 2.3.1pre-2402 -> 2.3.1pre-2411 --- .../development/libraries/physics/fastnlo_toolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix index 87e2ae9631c5..cbea1abf0d0a 100644 --- a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix +++ b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "fastnlo_toolkit"; - version = "2.3.1pre-2402"; + version = "2.3.1pre-2411"; src = fetchurl { url = "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz"; - sha256 = "1h41xnqcz401x3zbs8i2dsb4xlhbv8i5ps0561p6y7gcyridgcbl"; + sha256 = "0fm9k732pmi3prbicj2yaq815nmcjll95fagjqzf542ng3swpqnb"; }; buildInputs = [ From 4c00f66ef6f937581c96206fdf154cbe05a7dea9 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 24 Apr 2021 08:41:51 -0400 Subject: [PATCH 3/4] pythonPackages.fastnlo_toolkit: init --- .../physics/fastnlo_toolkit/default.nix | 21 +++++++++++-------- pkgs/top-level/python-packages.nix | 5 +++++ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix index cbea1abf0d0a..e01638e285b3 100644 --- a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix +++ b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix @@ -1,14 +1,16 @@ { lib , stdenv , fetchurl +, autoreconfHook , boost -, fastjet , gfortran , lhapdf -, python2 -, root +, ncurses +, python +, swig , yoda , zlib +, withPython ? false }: stdenv.mkDerivation rec { @@ -20,19 +22,20 @@ stdenv.mkDerivation rec { sha256 = "0fm9k732pmi3prbicj2yaq815nmcjll95fagjqzf542ng3swpqnb"; }; + nativeBuildInputs = lib.optional withPython autoreconfHook; + buildInputs = [ boost - fastjet gfortran gfortran.cc.lib lhapdf - python2 - root yoda - ]; + ] ++ lib.optional withPython python + ++ lib.optional (withPython && python.isPy3k) ncurses; + propagatedBuildInputs = [ zlib - ]; + ] ++ lib.optional withPython swig; preConfigure = '' substituteInPlace ./fastnlotoolkit/Makefile.in \ @@ -41,7 +44,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-yoda=${yoda}" - ]; + ] ++ lib.optional withPython "--enable-pyext"; enableParallelBuilding = true; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0671f45f80df..632713ec0b2c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2373,6 +2373,11 @@ in { fastjsonschema = callPackage ../development/python-modules/fastjsonschema { }; + fastnlo_toolkit = toPythonModule (pkgs.fastnlo_toolkit.override { + withPython = true; + inherit python; + }); + fastpair = callPackage ../development/python-modules/fastpair { }; fastparquet = callPackage ../development/python-modules/fastparquet { }; From f0c328e4a4392f5b5798471dc131605880169bdb Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 1 May 2021 12:33:44 -0400 Subject: [PATCH 4/4] fastnlo_toolkit: add a backup url for src --- .../libraries/physics/fastnlo_toolkit/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix index e01638e285b3..d6cbe7cc4dd0 100644 --- a/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix +++ b/pkgs/development/libraries/physics/fastnlo_toolkit/default.nix @@ -18,7 +18,10 @@ stdenv.mkDerivation rec { version = "2.3.1pre-2411"; src = fetchurl { - url = "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz"; + urls = [ + "https://fastnlo.hepforge.org/code/v23/${pname}-${version}.tar.gz" + "https://sid.ethz.ch/debian/fastnlo/${pname}-${version}.tar.gz" + ]; sha256 = "0fm9k732pmi3prbicj2yaq815nmcjll95fagjqzf542ng3swpqnb"; };