hepmc: rename to hepmc2

This commit is contained in:
Dmitry Kalinkin
2019-08-05 16:54:56 -04:00
parent d046fb8ea9
commit ecef988054
10 changed files with 18 additions and 17 deletions

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, boost, fastjet, hepmc, lhapdf, rsync, zlib }:
{ stdenv, fetchurl, boost, fastjet, hepmc2, lhapdf, rsync, zlib }:
stdenv.mkDerivation rec {
name = "pythia-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0y8w5gdaczg8vdw63rkgjr1dcvqs2clqkdia34p30xcwgm1jgv7q";
};
buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ];
buildInputs = [ boost fastjet hepmc2 zlib rsync lhapdf ];
preConfigure = ''
patchShebangs ./configure
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--enable-shared"
"--with-hepmc2=${hepmc}"
"--with-hepmc2=${hepmc2}"
"--with-lhapdf6=${lhapdf}"
];

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fastjet, ghostscript, gsl, hepmc, imagemagick, less, python2, texlive, yoda, which, makeWrapper }:
{ stdenv, fetchurl, fastjet, ghostscript, gsl, hepmc2, imagemagick, less, python2, texlive, yoda, which, makeWrapper }:
stdenv.mkDerivation rec {
name = "rivet-${version}";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
xkeyval
xstring
;};
buildInputs = [ hepmc imagemagick python2 latex makeWrapper ];
buildInputs = [ hepmc2 imagemagick python2 latex makeWrapper ];
propagatedBuildInputs = [ fastjet ghostscript gsl yoda ];
preConfigure = ''
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-fastjet=${fastjet}"
"--with-hepmc=${hepmc}"
"--with-hepmc=${hepmc2}"
"--with-yoda=${yoda}"
];

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, boost, fastjet, gsl, hepmc, lhapdf, rivet, zlib }:
{ stdenv, fetchurl, boost, fastjet, gsl, hepmc2, lhapdf, rivet, zlib }:
stdenv.mkDerivation rec {
name = "thepeg-${version}";
@@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
sha256 = "1rmmwhk9abn9mc9j3127axjwpvymv21ld4wcivwz01pldkxh06n6";
};
buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ];
buildInputs = [ boost fastjet gsl hepmc2 lhapdf rivet zlib ];
configureFlags = [
"--with-hepmc=${hepmc}"
"--with-hepmc=${hepmc2}"
"--with-rivet=${rivet}"
"--without-javagui"
];