Merge pull request #136359 from veprbl/pr/fastjet_3_4_0

fastjet: 3.3.4 -> 3.4.0

pkgs/development/libraries/physics/fastjet/default.nix

@@ -1,20 +1,24 @@
-{ lib, stdenv, fetchurl, python2 }:
+{ lib
+, stdenv
+, fetchurl
+, python
+, withPython ? false
+}:
 
 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 ];
+  buildInputs = lib.optional withPython python;
 
   configureFlags = [
     "--enable-allcxxplugins"
-    "--enable-pyext"
-    ];
+  ] ++ lib.optional withPython "--enable-pyext";
 
   enableParallelBuilding = true;
 

pkgs/top-level/python-packages.nix

@@ -2520,6 +2520,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 {