hepmc: rename to hepmc2
This commit is contained in:
parent
d046fb8ea9
commit
ecef988054
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, boost, hepmc, lhapdf, pythia, makeWrapper }:
|
{ stdenv, fetchurl, boost, hepmc2, lhapdf, pythia, makeWrapper }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "sacrifice-${version}";
|
name = "sacrifice-${version}";
|
||||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "10bvpq63kmszy1habydwncm0j1dgvam0fkrmvkgbkvf804dcjp6g";
|
sha256 = "10bvpq63kmszy1habydwncm0j1dgvam0fkrmvkgbkvf804dcjp6g";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ boost hepmc lhapdf pythia ];
|
buildInputs = [ boost hepmc2 lhapdf pythia ];
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-HepMC=${hepmc}"
|
"--with-HepMC=${hepmc2}"
|
||||||
"--with-pythia=${pythia}"
|
"--with-pythia=${pythia}"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, gfortran, hepmc, fastjet, lhapdf, rivet, sqlite }:
|
{ stdenv, fetchurl, gfortran, hepmc2, fastjet, lhapdf, rivet, sqlite }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "sherpa-${version}";
|
name = "sherpa-${version}";
|
||||||
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-sqlite3=${sqlite.dev}"
|
"--with-sqlite3=${sqlite.dev}"
|
||||||
"--enable-hepmc2=${hepmc}"
|
"--enable-hepmc2=${hepmc2}"
|
||||||
"--enable-fastjet=${fastjet}"
|
"--enable-fastjet=${fastjet}"
|
||||||
"--enable-lhapdf=${lhapdf}"
|
"--enable-lhapdf=${lhapdf}"
|
||||||
"--enable-rivet=${rivet}"
|
"--enable-rivet=${rivet}"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, boost, fastjet, hepmc, lhapdf, rsync, zlib }:
|
{ stdenv, fetchurl, boost, fastjet, hepmc2, lhapdf, rsync, zlib }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "pythia-${version}";
|
name = "pythia-${version}";
|
||||||
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "0y8w5gdaczg8vdw63rkgjr1dcvqs2clqkdia34p30xcwgm1jgv7q";
|
sha256 = "0y8w5gdaczg8vdw63rkgjr1dcvqs2clqkdia34p30xcwgm1jgv7q";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ];
|
buildInputs = [ boost fastjet hepmc2 zlib rsync lhapdf ];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
patchShebangs ./configure
|
patchShebangs ./configure
|
||||||
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--enable-shared"
|
"--enable-shared"
|
||||||
"--with-hepmc2=${hepmc}"
|
"--with-hepmc2=${hepmc2}"
|
||||||
"--with-lhapdf6=${lhapdf}"
|
"--with-lhapdf6=${lhapdf}"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -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 {
|
stdenv.mkDerivation rec {
|
||||||
name = "rivet-${version}";
|
name = "rivet-${version}";
|
||||||
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
|
|||||||
xkeyval
|
xkeyval
|
||||||
xstring
|
xstring
|
||||||
;};
|
;};
|
||||||
buildInputs = [ hepmc imagemagick python2 latex makeWrapper ];
|
buildInputs = [ hepmc2 imagemagick python2 latex makeWrapper ];
|
||||||
propagatedBuildInputs = [ fastjet ghostscript gsl yoda ];
|
propagatedBuildInputs = [ fastjet ghostscript gsl yoda ];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-fastjet=${fastjet}"
|
"--with-fastjet=${fastjet}"
|
||||||
"--with-hepmc=${hepmc}"
|
"--with-hepmc=${hepmc2}"
|
||||||
"--with-yoda=${yoda}"
|
"--with-yoda=${yoda}"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -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 {
|
stdenv.mkDerivation rec {
|
||||||
name = "thepeg-${version}";
|
name = "thepeg-${version}";
|
||||||
@ -9,10 +9,10 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "1rmmwhk9abn9mc9j3127axjwpvymv21ld4wcivwz01pldkxh06n6";
|
sha256 = "1rmmwhk9abn9mc9j3127axjwpvymv21ld4wcivwz01pldkxh06n6";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ];
|
buildInputs = [ boost fastjet gsl hepmc2 lhapdf rivet zlib ];
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-hepmc=${hepmc}"
|
"--with-hepmc=${hepmc2}"
|
||||||
"--with-rivet=${rivet}"
|
"--with-rivet=${rivet}"
|
||||||
"--without-javagui"
|
"--without-javagui"
|
||||||
];
|
];
|
||||||
|
@ -42,9 +42,9 @@ buildPythonPackage rec {
|
|||||||
'';
|
'';
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgs.swig ];
|
nativeBuildInputs = [ pkgs.swig ];
|
||||||
buildInputs = [ pkgs.hepmc ];
|
buildInputs = [ pkgs.hepmc2 ];
|
||||||
|
|
||||||
HEPMCPATH = pkgs.hepmc;
|
HEPMCPATH = pkgs.hepmc2;
|
||||||
|
|
||||||
checkPhase = ''
|
checkPhase = ''
|
||||||
${python.interpreter} test/test1.py
|
${python.interpreter} test/test1.py
|
||||||
|
@ -145,6 +145,7 @@ mapAliases ({
|
|||||||
gupnptools = gupnp-tools; # added 2015-12-19
|
gupnptools = gupnp-tools; # added 2015-12-19
|
||||||
gutenberg = zola; # added 2018-11-17
|
gutenberg = zola; # added 2018-11-17
|
||||||
heimdalFull = heimdal; # added 2018-05-01
|
heimdalFull = heimdal; # added 2018-05-01
|
||||||
|
hepmc = hepmc2; # added 2019-08-05
|
||||||
hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25
|
hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25
|
||||||
htmlTidy = html-tidy; # added 2014-12-06
|
htmlTidy = html-tidy; # added 2014-12-06
|
||||||
iana_etc = iana-etc; # added 2017-03-08
|
iana_etc = iana-etc; # added 2017-03-08
|
||||||
|
@ -23336,7 +23336,7 @@ in
|
|||||||
|
|
||||||
g4py = callPackage ../development/libraries/physics/geant4/g4py { };
|
g4py = callPackage ../development/libraries/physics/geant4/g4py { };
|
||||||
|
|
||||||
hepmc = callPackage ../development/libraries/physics/hepmc { };
|
hepmc2 = callPackage ../development/libraries/physics/hepmc2 { };
|
||||||
|
|
||||||
hepmc3 = callPackage ../development/libraries/physics/hepmc3 { };
|
hepmc3 = callPackage ../development/libraries/physics/hepmc3 { };
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user