Merge pull request #21528 from veprbl/kak2

update rivet, kakoune, add fastnlo, sherpa, mcgrid
This commit is contained in:
Graham Christensen 2016-12-30 22:36:53 -05:00 committed by GitHub
commit 1fd97f6293
6 changed files with 88 additions and 10 deletions

View file

@ -4,17 +4,18 @@ with stdenv.lib;
stdenv.mkDerivation rec {
name = "kakoune-nightly-${version}";
version = "2016-12-10";
version = "2016-12-30";
src = fetchFromGitHub {
repo = "kakoune";
owner = "mawww";
rev = "e44129577a010ebb4dc609b806104d3175659074";
sha256 = "1jkpbk6wa9x5nlv002y1whv6ddhqawxzbp3jcbzcb51cg8bz0b1l";
rev = "76c58aa022a896dc170c207ff821992ee354d934";
sha256 = "0hgpcp6444cyg4bm0a9ypywjwfh19qpqpfr5w0wcd2y3clnsvsdz";
};
buildInputs = [ ncurses boost asciidoc docbook_xsl libxslt ];
buildPhase = ''
sed -ie 's#--no-xmllint#--no-xmllint --xsltproc-opts="--nonet"#g' src/Makefile
substituteInPlace src/Makefile --replace "boost_regex-mt" "boost_regex"
export PREFIX=$out
(cd src && make )
'';
@ -28,6 +29,6 @@ stdenv.mkDerivation rec {
description = "A vim inspired text editor";
license = licenses.publicDomain;
maintainers = with maintainers; [ vrthra ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}

View file

@ -0,0 +1,23 @@
{ stdenv, fetchurl, gfortran, sqlite }:
stdenv.mkDerivation rec {
name = "sherpa-${version}";
version = "2.2.1";
src = fetchurl {
url = "http://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz";
sha256 = "13vkz6w8kqyv8sgy3mxnlps5ykml5rnlj50vjj0pp9rgbl5y8ali";
};
buildInputs = [ gfortran sqlite ];
enableParallelBuilding = true;
meta = {
description = "Simulation of High-Energy Reactions of PArticles in lepton-lepton, lepton-photon, photon-photon, lepton-hadron and hadron-hadron collisions";
license = stdenv.lib.licenses.gpl2;
homepage = https://sherpa.hepforge.org;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ veprbl ];
};
}

View file

@ -0,0 +1,23 @@
{ stdenv, fetchurl, boost, lhapdf, root, yoda }:
stdenv.mkDerivation rec {
name = "fastnlo_toolkit-${version}";
version = "2.3.1pre-2212";
src = fetchurl {
url = "http://fastnlo.hepforge.org/code/v23/${name}.tar.gz";
sha256 = "0xgnnwc002awvz6dhn7792jc8kdff843yjgvwmgcs60yvcj6blgp";
};
buildInputs = [ boost lhapdf root yoda ];
enableParallelBuilding = true;
meta = {
descritption = "A computer code to create and evaluate fast interpolation tables of pre-computed coefficients in perturbation theory for observables in hadron-induced processes";
license = stdenv.lib.licenses.gpl3;
homepage = http://fastnlo.hepforge.org;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ veprbl ];
};
}

View file

@ -0,0 +1,29 @@
{ stdenv, fetchurl, fastnlo, rivet, sherpa }:
stdenv.mkDerivation rec {
name = "mcgrid-${version}";
version = "2.0.2";
src = fetchurl {
url = "http://www.hepforge.org/archive/mcgrid/${name}.tar.gz";
sha256 = "1mw82x7zqbdchnd6shj3dirsav5i2cndp2hjwb8a8xdh4xh9zvfy";
};
buildInputs = [ fastnlo rivet ];
preConfigure = ''
substituteInPlace mcgrid.pc.in \
--replace "Cflags:" "Cflags: -std=c++11"
'';
CXXFLAGS = "-std=c++11";
enableParallelBuilding = true;
meta = {
description = "A software package that provides access to the APPLgrid and fastNLO interpolation tools for Monte Carlo event generator codes, allowing for fast and flexible variations of scales, coupling parameters and PDFs in cutting edge leading- and next-to-leading-order QCD calculations";
license = stdenv.lib.licenses.gpl3;
homepage = http://mcgrid.hepforge.org;
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ veprbl ];
};
}

View file

@ -2,19 +2,15 @@
stdenv.mkDerivation rec {
name = "rivet-${version}";
version = "2.5.2";
version = "2.5.3";
src = fetchurl {
url = "http://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
sha256 = "01agf0bswqvci8nwp67kvrlwc2k0sg1s0lxpq2a9q58l99v2gakh";
sha256 = "1r0x575ivvm68nnh9qlfvdra5298i047qcbxcg37ki2aaqq07qcr";
};
pythonPath = []; # python wrapper support
patches = [
./key_val.patch
./zaxis_fix.patch
];
latex = texlive.combine { inherit (texlive)
scheme-basic

View file

@ -16784,6 +16784,8 @@ in
sacrifice = callPackage ../applications/science/physics/sacrifice {};
sherpa = callPackage ../applications/science/physics/sherpa {};
### SCIENCE/PROGRAMMING
plm = callPackage ../applications/science/programming/plm { };
@ -17136,6 +17138,8 @@ in
fastjet = callPackage ../development/libraries/physics/fastjet { };
fastnlo = callPackage ../development/libraries/physics/fastnlo { };
geant4 = callPackage ../development/libraries/physics/geant4 {
enableMultiThreading = true;
enableG3toG4 = false;
@ -17168,6 +17172,8 @@ in
lhapdf = callPackage ../development/libraries/physics/lhapdf { };
mcgrid = callPackage ../development/libraries/physics/mcgrid { };
nlojet = callPackage ../development/libraries/physics/nlojet { };
pythia = callPackage ../development/libraries/physics/pythia { };