pyrox.dev
Merge pull request #173321 from veprbl/pr/lhapdf_6_5_1
lhapdf: 6.4.0 -> 6.5.1
authored by Dmitry Kalinkin and committed by GitHub 83ad22d8 28fa3ec5
+10
-3
pkgs/development/libraries/physics/lhapdf/default.nix
+10
-3
pkgs/development/libraries/physics/lhapdf/default.nix
···
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "lhapdf";
5
-
version = "6.4.0";
5
+
version = "6.5.1";
6
6
7
7
src = fetchurl {
8
8
url = "https://www.hepforge.org/archive/lhapdf/LHAPDF-${version}.tar.gz";
9
-
sha256 = "sha256-fS8CZ+LWWw3e4EhVOzQtfIk6bbq+HjJsrWLeABDdgQw=";
9
+
sha256 = "sha256-ElZBniIn0aT5M4f+HagF5kg1FBfTdV6K9aMKNaamZ1E=";
10
10
};
11
11
12
12
# The Apple SDK only exports locale_t from xlocale.h whereas glibc
···
15
15
substituteInPlace src/GridPDF.cc --replace '#include <locale>' '#include <xlocale.h>'
16
16
'';
17
17
18
-
nativeBuildInputs = [ makeWrapper ];
18
+
nativeBuildInputs = [ makeWrapper ]
19
+
++ lib.optionals (python != null && lib.versionAtLeast python.version "3.10") [ python.pkgs.cython ];
19
20
buildInputs = [ python ];
21
+
22
+
configureFlags = lib.optionals (python == null) [ "--disable-python" ];
23
+
24
+
preBuild = lib.optionalString (python != null && lib.versionAtLeast python.version "3.10") ''
25
+
rm wrappers/python/lhapdf.cpp
26
+
'';
20
27
21
28
enableParallelBuilding = true;
22
29
+1
-1
pkgs/top-level/all-packages.nix
+1
-1
pkgs/top-level/all-packages.nix
···
33191
33191
33192
33192
mcfm = callPackage ../applications/science/physics/MCFM {
33193
33193
stdenv = gccStdenv;
33194
-
lhapdf = lhapdf.override { stdenv = gccStdenv; };
33194
+
lhapdf = lhapdf.override { stdenv = gccStdenv; python = null; };
33195
33195
};
33196
33196
33197
33197
nnpdf = callPackage ../applications/science/physics/nnpdf { };