From 0c86c19d2269069e1825cf7546f7307060a87393 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 16 May 2022 18:44:00 -0400 Subject: [PATCH 1/3] lhapdf: 6.4.0 -> 6.5.1 --- pkgs/development/libraries/physics/lhapdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index a3753d86356e..eb891fd4dbe3 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lhapdf"; - version = "6.4.0"; + version = "6.5.1"; src = fetchurl { url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz"; - sha256 = "sha256-fS8CZ+LWWw3e4EhVOzQtfIk6bbq+HjJsrWLeABDdgQw="; + sha256 = "sha256-ElZBniIn0aT5M4f+HagF5kg1FBfTdV6K9aMKNaamZ1E="; }; # The Apple SDK only exports locale_t from xlocale.h whereas glibc From e7d67d857632b609b4cf33b9a213d2af224f47db Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 16 May 2022 23:31:51 -0400 Subject: [PATCH 2/3] python3Packages.lhapdf: fix for python 3.10+ --- pkgs/development/libraries/physics/lhapdf/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index eb891fd4dbe3..c31d9794407f 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -15,9 +15,14 @@ stdenv.mkDerivation rec { substituteInPlace src/GridPDF.cc --replace '#include ' '#include ' ''; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ] + ++ lib.optionals (lib.versionAtLeast python.version "3.10") [ python.pkgs.cython ]; buildInputs = [ python ]; + preBuild = lib.optionalString (lib.versionAtLeast python.version "3.10") '' + rm wrappers/python/lhapdf.cpp + ''; + enableParallelBuilding = true; passthru = { From 588d62e2d410716769d08358e7fe20b537bd626b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 18 May 2022 14:40:35 -0400 Subject: [PATCH 3/3] mcfm: fix gcc-flavored lhapdf for darwin An updated LHAPDF picks up CoreFoundation from `python-config --libs`, which isn't present in gccStdenv. --- pkgs/development/libraries/physics/lhapdf/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index c31d9794407f..991309b54d46 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -16,10 +16,12 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ makeWrapper ] - ++ lib.optionals (lib.versionAtLeast python.version "3.10") [ python.pkgs.cython ]; + ++ lib.optionals (python != null && lib.versionAtLeast python.version "3.10") [ python.pkgs.cython ]; buildInputs = [ python ]; - preBuild = lib.optionalString (lib.versionAtLeast python.version "3.10") '' + configureFlags = lib.optionals (python == null) [ "--disable-python" ]; + + preBuild = lib.optionalString (python != null && lib.versionAtLeast python.version "3.10") '' rm wrappers/python/lhapdf.cpp ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03b807a06863..9b3cef9a6b83 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33164,7 +33164,7 @@ with pkgs; mcfm = callPackage ../applications/science/physics/MCFM { stdenv = gccStdenv; - lhapdf = lhapdf.override { stdenv = gccStdenv; }; + lhapdf = lhapdf.override { stdenv = gccStdenv; python = null; }; }; nnpdf = callPackage ../applications/science/physics/nnpdf { };