BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #126044 from veprbl/pr/lhapdf_python3

Browse source 
lhapdf: allow using different python versions, default to python3
This commit is contained in:
Robert Scott 2021-06-07 23:58:33 +01:00 committed by GitHub
commit ce3f3e6e64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/physics/lhapdf/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, python2, makeWrapper }:
{ lib, stdenv, fetchurl, python, makeWrapper }:
stdenv.mkDerivation rec {
pname = "lhapdf";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ python2 ];
buildInputs = [ python ];
enableParallelBuilding = true;

4
pkgs/top-level/all-packages.nix
View file

@ -30211,7 +30211,9 @@ in
herwig = callPackage ../development/libraries/physics/herwig { };
lhapdf = callPackage ../development/libraries/physics/lhapdf { };
lhapdf = callPackage ../development/libraries/physics/lhapdf {
python = python3;
};
mela = callPackage ../development/libraries/physics/mela { };

4
pkgs/top-level/python-packages.nix
View file

@ -3840,6 +3840,10 @@ in {
lexid = callPackage ../development/python-modules/lexid { };
lhapdf = toPythonModule (pkgs.lhapdf.override {
inherit python;
});
libagent = callPackage ../development/python-modules/libagent { };
pa-ringbuffer = callPackage ../development/python-modules/pa-ringbuffer { };