public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source 
Quite many rebuilds from master:
> Estimating rebuild amount by counting changed Hydra jobs.
>    3926 x86_64-darwin
>    4645 x86_64-linux
This commit is contained in:
Vladimír Čunát
2020-10-10 10:18:58 +02:00
parent ec28e32c9e 8bc409e546
commit 338b25697c
138 changed files with 4330 additions and 3214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/libraries/physics/pythia/default.nix
View File

@@ -1,15 +1,15 @@
{ stdenv, fetchurl, boost, fastjet, hepmc2, lhapdf, rsync, zlib }:
{ stdenv, fetchurl, boost, fastjet, hepmc, lhapdf, rsync, zlib }:
stdenv.mkDerivation rec {
pname = "pythia";
version = "8.244";
version = "8.303";
src = fetchurl {
url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz";
sha256 = "1jlj9hgmk2gcm5p0zqsiz0dpv9vvj8ip261si7frrwfsk7wq0j73";
sha256 = "0gli6zf8931i7kyminppisc9d0q69xxnalvhld5fgnkh4q82nz6d";
};
buildInputs = [ boost fastjet hepmc2 zlib rsync lhapdf ];
buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ];
preConfigure = ''
patchShebangs ./configure
@@ -17,9 +17,12 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-shared"
"--with-hepmc2=${hepmc2}"
"--with-lhapdf6=${lhapdf}"
];
] ++ (if stdenv.lib.versions.major hepmc.version == "3" then [
"--with-hepmc3=${hepmc}"
] else [
"--with-hepmc2=${hepmc}"
]);
enableParallelBuilding = true;