pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #126044 from veprbl/pr/lhapdf_python3

lhapdf: allow using different python versions, default to python3

authored by

Robert Scott and committed by
GitHub ce3f3e6e b8f2701a

+9 -3
unified split
+2 -2
pkgs/development/libraries/physics/lhapdf/default.nix
··· 1 - { lib, stdenv, fetchurl, python2, makeWrapper }: 1 + { lib, stdenv, fetchurl, python, makeWrapper }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "lhapdf"; ··· 10 10 }; 11 11 12 12 nativeBuildInputs = [ makeWrapper ]; 13 - buildInputs = [ python2 ]; 13 + buildInputs = [ python ]; 14 14 15 15 enableParallelBuilding = true; 16 16
+3 -1
pkgs/top-level/all-packages.nix
··· 30211 30211 30212 30212 herwig = callPackage ../development/libraries/physics/herwig { }; 30213 30213 30214 - lhapdf = callPackage ../development/libraries/physics/lhapdf { }; 30214 + lhapdf = callPackage ../development/libraries/physics/lhapdf { 30215 + python = python3; 30216 + }; 30215 30217 30216 30218 mela = callPackage ../development/libraries/physics/mela { }; 30217 30219
+4
pkgs/top-level/python-packages.nix
··· 3840 3840 3841 3841 lexid = callPackage ../development/python-modules/lexid { }; 3842 3842 3843 + lhapdf = toPythonModule (pkgs.lhapdf.override { 3844 + inherit python; 3845 + }); 3846 + 3843 3847 libagent = callPackage ../development/python-modules/libagent { }; 3844 3848 3845 3849 pa-ringbuffer = callPackage ../development/python-modules/pa-ringbuffer { };