ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-06 20:48:32 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #173321 from veprbl/pr/lhapdf_6_5_1

Browse Source 
lhapdf: 6.4.0 -> 6.5.1
This commit is contained in:
Dmitry Kalinkin 2022-05-29 21:46:58 -04:00 committed by GitHub
commit 83ad22d8c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/physics/lhapdf/default.nix
View File

@ -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
@ -15,9 +15,16 @@ stdenv.mkDerivation rec {
substituteInPlace src/GridPDF.cc --replace '#include <locale>' '#include <xlocale.h>'
'';
nativeBuildInputs = [ makeWrapper ];
nativeBuildInputs = [ makeWrapper ]
++ lib.optionals (python != null && lib.versionAtLeast python.version "3.10") [ python.pkgs.cython ];
buildInputs = [ python ];
configureFlags = lib.optionals (python == null) [ "--disable-python" ];
preBuild = lib.optionalString (python != null && lib.versionAtLeast python.version "3.10") ''
rm wrappers/python/lhapdf.cpp
'';
enableParallelBuilding = true;
passthru = {

2
pkgs/top-level/all-packages.nix
View File

@ -33191,7 +33191,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 { };