ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-10 16:45:51 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #66117 from veprbl/pr/hepmc_2_06_10

Browse Source 
hepmc: 2.06.09 -> 2.06.10
This commit is contained in:
Dmitry Kalinkin 2019-08-11 22:16:16 -04:00 committed by GitHub
commit 34224c7ba0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/science/physics/sacrifice/default.nix
View File

@ -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}"
];

4
pkgs/applications/science/physics/sherpa/default.nix
View File

@ -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}"

8
pkgs/development/libraries/physics/hepmc/default.nix → pkgs/development/libraries/physics/hepmc2/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "hepmc-${version}";
version = "2.06.09";
version = "2.06.10";
src = fetchurl {
url = "http://lcgapp.cern.ch/project/simu/HepMC/download/HepMC-${version}.tar.gz";
sha256 = "020sc7hzy7d6d1i6bs352hdzy5zy5zxkc33cw0jhh8s0jz5281y6";
url = "http://hepmc.web.cern.ch/hepmc/releases/HepMC-${version}.tar.gz";
sha256 = "190i9jlnwz1xpc495y0xc70s4zdqb9s2zdq1zkjy2ivl7ygdvpjs";
};
patches = [ ./in_source.patch ];
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
meta = {
description = "The HepMC package is an object oriented event record written in C++ for High Energy Physics Monte Carlo Generators";
license = stdenv.lib.licenses.gpl2;
homepage = http://lcgapp.cern.ch/project/simu/HepMC/;
homepage = http://hepmc.web.cern.ch/hepmc/;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ veprbl ];
};

0
pkgs/development/libraries/physics/hepmc/in_source.patch → pkgs/development/libraries/physics/hepmc2/in_source.patch
View File

6
pkgs/development/libraries/physics/pythia/default.nix
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}"
];

6
pkgs/development/libraries/physics/rivet/default.nix
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}"
];

6
pkgs/development/libraries/physics/thepeg/default.nix
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"
];

4
pkgs/development/python-modules/pyhepmc/default.nix
View File

@ -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

1
pkgs/top-level/aliases.nix
View File

@ -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

2
pkgs/top-level/all-packages.nix
View File

@ -23404,7 +23404,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 { };