From 249cc6f92f3842b519e3c0ccab6c011da4008841 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 1 Sep 2021 04:03:08 -0400 Subject: [PATCH 1/2] fastjet: 3.3.4 -> 3.4.0 --- pkgs/development/libraries/physics/fastjet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index 35ce8dedca74..55d272f405b7 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fastjet"; - version = "3.3.4"; + version = "3.4.0"; src = fetchurl { url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz"; - sha256 = "00zwvmnp2j79z95n9lgnq67q02bqfgirqla8j9y6jd8k3r052as3"; + hash = "sha256-7gfIdHyOrYbYjeSp5OjR6efXYUlz9WMbqCl/egJHi5E="; }; buildInputs = [ python2 ]; From 76f507357347e41de512039e189e5016edcaa2bb Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 4 Sep 2021 06:51:27 -0400 Subject: [PATCH 2/2] pythonPackages.fastjet: init --- .../libraries/physics/fastjet/default.nix | 12 ++++++++---- pkgs/top-level/python-packages.nix | 5 +++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index 55d272f405b7..65fb04b707ab 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, python2 }: +{ lib +, stdenv +, fetchurl +, python +, withPython ? false +}: stdenv.mkDerivation rec { pname = "fastjet"; @@ -9,12 +14,11 @@ stdenv.mkDerivation rec { hash = "sha256-7gfIdHyOrYbYjeSp5OjR6efXYUlz9WMbqCl/egJHi5E="; }; - buildInputs = [ python2 ]; + buildInputs = lib.optional withPython python; configureFlags = [ "--enable-allcxxplugins" - "--enable-pyext" - ]; + ] ++ lib.optional withPython "--enable-pyext"; enableParallelBuilding = true; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ef3b52af0a4..9264ed7b2d0f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2502,6 +2502,11 @@ in { fastimport = callPackage ../development/python-modules/fastimport { }; + fastjet = toPythonModule (pkgs.fastjet.override { + withPython = true; + inherit python; + }); + fastjsonschema = callPackage ../development/python-modules/fastjsonschema { }; fastnlo_toolkit = toPythonModule (pkgs.fastnlo_toolkit.override {