From ecef98805480875bc0c7d6657389caad13df6b88 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 5 Aug 2019 16:54:56 -0400 Subject: [PATCH] hepmc: rename to hepmc2 --- pkgs/applications/science/physics/sacrifice/default.nix | 6 +++--- pkgs/applications/science/physics/sherpa/default.nix | 4 ++-- .../libraries/physics/{hepmc => hepmc2}/default.nix | 0 .../libraries/physics/{hepmc => hepmc2}/in_source.patch | 0 pkgs/development/libraries/physics/pythia/default.nix | 6 +++--- pkgs/development/libraries/physics/rivet/default.nix | 6 +++--- pkgs/development/libraries/physics/thepeg/default.nix | 6 +++--- pkgs/development/python-modules/pyhepmc/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 10 files changed, 18 insertions(+), 17 deletions(-) rename pkgs/development/libraries/physics/{hepmc => hepmc2}/default.nix (100%) rename pkgs/development/libraries/physics/{hepmc => hepmc2}/in_source.patch (100%) diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index 64b88dcc3d4f..d43a05f1c616 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, hepmc, lhapdf, pythia, makeWrapper }: +{ stdenv, fetchurl, boost, hepmc2, lhapdf, pythia, makeWrapper }: stdenv.mkDerivation rec { name = "sacrifice-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "10bvpq63kmszy1habydwncm0j1dgvam0fkrmvkgbkvf804dcjp6g"; }; - buildInputs = [ boost hepmc lhapdf pythia ]; + buildInputs = [ boost hepmc2 lhapdf pythia ]; nativeBuildInputs = [ makeWrapper ]; patches = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-HepMC=${hepmc}" + "--with-HepMC=${hepmc2}" "--with-pythia=${pythia}" ]; diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index 7cb3e8881caf..1d61c612563f 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, hepmc, fastjet, lhapdf, rivet, sqlite }: +{ stdenv, fetchurl, gfortran, hepmc2, fastjet, lhapdf, rivet, sqlite }: stdenv.mkDerivation rec { name = "sherpa-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-sqlite3=${sqlite.dev}" - "--enable-hepmc2=${hepmc}" + "--enable-hepmc2=${hepmc2}" "--enable-fastjet=${fastjet}" "--enable-lhapdf=${lhapdf}" "--enable-rivet=${rivet}" diff --git a/pkgs/development/libraries/physics/hepmc/default.nix b/pkgs/development/libraries/physics/hepmc2/default.nix similarity index 100% rename from pkgs/development/libraries/physics/hepmc/default.nix rename to pkgs/development/libraries/physics/hepmc2/default.nix diff --git a/pkgs/development/libraries/physics/hepmc/in_source.patch b/pkgs/development/libraries/physics/hepmc2/in_source.patch similarity index 100% rename from pkgs/development/libraries/physics/hepmc/in_source.patch rename to pkgs/development/libraries/physics/hepmc2/in_source.patch diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 2e17e49dcdb1..e6b351c206df 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -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}" ]; diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index c8dae0c2b51a..c068424e416e 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -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}" ]; diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 046413c64f49..272761977bae 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -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" ]; diff --git a/pkgs/development/python-modules/pyhepmc/default.nix b/pkgs/development/python-modules/pyhepmc/default.nix index 0ff269c98740..26a91a313ee4 100644 --- a/pkgs/development/python-modules/pyhepmc/default.nix +++ b/pkgs/development/python-modules/pyhepmc/default.nix @@ -42,9 +42,9 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ pkgs.swig ]; - buildInputs = [ pkgs.hepmc ]; + buildInputs = [ pkgs.hepmc2 ]; - HEPMCPATH = pkgs.hepmc; + HEPMCPATH = pkgs.hepmc2; checkPhase = '' ${python.interpreter} test/test1.py diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a1ad553e0481..10ca9315d351 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -145,6 +145,7 @@ mapAliases ({ gupnptools = gupnp-tools; # added 2015-12-19 gutenberg = zola; # added 2018-11-17 heimdalFull = heimdal; # added 2018-05-01 + hepmc = hepmc2; # added 2019-08-05 hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25 htmlTidy = html-tidy; # added 2014-12-06 iana_etc = iana-etc; # added 2017-03-08 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2b89a411d62..ce7a54cce5e6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23336,7 +23336,7 @@ in 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 { };