git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #21528 from veprbl/kak2

update rivet, kakoune, add fastnlo, sherpa, mcgrid

commit1fd97f6293ac4737af2c2d8d62240c8feb7072bb authorGraham Christensen <graham@grahamc.com> dateFri 30 Dec 2016, 22:36 (10 years ago) parentb86d2562dd8aea
6 files changed+88−10
compare with master
unifiedsplit
pkgs/applications/editors/kakoune/default.nix+5−4 pkgs/applications/science/physics/sherpa/default.nix+23 pkgs/development/libraries/physics/fastnlo/default.nix+23 pkgs/development/libraries/physics/mcgrid/default.nix+29 pkgs/development/libraries/physics/rivet/default.nix+2−6 pkgs/top-level/all-packages.nix+6
pkgs/applications/editors/kakoune/default.nix+5−4
@@ -4,17 +4,18 @@ with stdenv.lib;
44
55stdenv.mkDerivation rec {
66 name = "kakoune-nightly-${version}";
7− version = "2016-12-10";
7+ version = "2016-12-30";
88 src = fetchFromGitHub {
99 repo = "kakoune";
1010 owner = "mawww";
11− rev = "e44129577a010ebb4dc609b806104d3175659074";
12− sha256 = "1jkpbk6wa9x5nlv002y1whv6ddhqawxzbp3jcbzcb51cg8bz0b1l";
11+ rev = "76c58aa022a896dc170c207ff821992ee354d934";
12+ sha256 = "0hgpcp6444cyg4bm0a9ypywjwfh19qpqpfr5w0wcd2y3clnsvsdz";
1313 };
1414 buildInputs = [ ncurses boost asciidoc docbook_xsl libxslt ];
1515
1616 buildPhase = ''
1717 sed -ie 's#--no-xmllint#--no-xmllint --xsltproc-opts="--nonet"#g' src/Makefile
18+ substituteInPlace src/Makefile --replace "boost_regex-mt" "boost_regex"
1819 export PREFIX=$out
1920 (cd src && make )
2021 '';
@@ -28,6 +29,6 @@ stdenv.mkDerivation rec {
2829 description = "A vim inspired text editor";
2930 license = licenses.publicDomain;
3031 maintainers = with maintainers; [ vrthra ];
31− platforms = platforms.linux;
32+ platforms = platforms.unix;
3233 };
3334}
pkgs/applications/science/physics/sherpa/default.nixnew file+23
@@ -0,0 +1,23 @@
1+{ stdenv, fetchurl, gfortran, sqlite }:
2+
3+stdenv.mkDerivation rec {
4+ name = "sherpa-${version}";
5+ version = "2.2.1";
6+
7+ src = fetchurl {
8+ url = "http://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz";
9+ sha256 = "13vkz6w8kqyv8sgy3mxnlps5ykml5rnlj50vjj0pp9rgbl5y8ali";
10+ };
11+
12+ buildInputs = [ gfortran sqlite ];
13+
14+ enableParallelBuilding = true;
15+
16+ meta = {
17+ description = "Simulation of High-Energy Reactions of PArticles in lepton-lepton, lepton-photon, photon-photon, lepton-hadron and hadron-hadron collisions";
18+ license = stdenv.lib.licenses.gpl2;
19+ homepage = https://sherpa.hepforge.org;
20+ platforms = stdenv.lib.platforms.unix;
21+ maintainers = with stdenv.lib.maintainers; [ veprbl ];
22+ };
23+}
pkgs/development/libraries/physics/fastnlo/default.nixnew file+23
@@ -0,0 +1,23 @@
1+{ stdenv, fetchurl, boost, lhapdf, root, yoda }:
2+
3+stdenv.mkDerivation rec {
4+ name = "fastnlo_toolkit-${version}";
5+ version = "2.3.1pre-2212";
6+
7+ src = fetchurl {
8+ url = "http://fastnlo.hepforge.org/code/v23/${name}.tar.gz";
9+ sha256 = "0xgnnwc002awvz6dhn7792jc8kdff843yjgvwmgcs60yvcj6blgp";
10+ };
11+
12+ buildInputs = [ boost lhapdf root yoda ];
13+
14+ enableParallelBuilding = true;
15+
16+ meta = {
17+ descritption = "A computer code to create and evaluate fast interpolation tables of pre-computed coefficients in perturbation theory for observables in hadron-induced processes";
18+ license = stdenv.lib.licenses.gpl3;
19+ homepage = http://fastnlo.hepforge.org;
20+ platforms = stdenv.lib.platforms.unix;
21+ maintainers = with stdenv.lib.maintainers; [ veprbl ];
22+ };
23+}
pkgs/development/libraries/physics/mcgrid/default.nixnew file+29
@@ -0,0 +1,29 @@
1+{ stdenv, fetchurl, fastnlo, rivet, sherpa }:
2+
3+stdenv.mkDerivation rec {
4+ name = "mcgrid-${version}";
5+ version = "2.0.2";
6+
7+ src = fetchurl {
8+ url = "http://www.hepforge.org/archive/mcgrid/${name}.tar.gz";
9+ sha256 = "1mw82x7zqbdchnd6shj3dirsav5i2cndp2hjwb8a8xdh4xh9zvfy";
10+ };
11+
12+ buildInputs = [ fastnlo rivet ];
13+
14+ preConfigure = ''
15+ substituteInPlace mcgrid.pc.in \
16+ --replace "Cflags:" "Cflags: -std=c++11"
17+ '';
18+
19+ CXXFLAGS = "-std=c++11";
20+ enableParallelBuilding = true;
21+
22+ meta = {
23+ 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";
24+ license = stdenv.lib.licenses.gpl3;
25+ homepage = http://mcgrid.hepforge.org;
26+ platforms = stdenv.lib.platforms.unix;
27+ maintainers = with stdenv.lib.maintainers; [ veprbl ];
28+ };
29+}
pkgs/development/libraries/physics/rivet/default.nix+2−6
@@ -2,19 +2,15 @@
22
33stdenv.mkDerivation rec {
44 name = "rivet-${version}";
5− version = "2.5.2";
5+ version = "2.5.3";
66
77 src = fetchurl {
88 url = "http://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
9− sha256 = "01agf0bswqvci8nwp67kvrlwc2k0sg1s0lxpq2a9q58l99v2gakh";
9+ sha256 = "1r0x575ivvm68nnh9qlfvdra5298i047qcbxcg37ki2aaqq07qcr";
1010 };
1111
1212 pythonPath = []; # python wrapper support
1313
14− patches = [
15− ./key_val.patch
16− ./zaxis_fix.patch
17− ];
1814
1915 latex = texlive.combine { inherit (texlive)
2016 scheme-basic
pkgs/top-level/all-packages.nix+6
@@ -16784,6 +16784,8 @@ in
1678416784
1678516785 sacrifice = callPackage ../applications/science/physics/sacrifice {};
1678616786
16787+ sherpa = callPackage ../applications/science/physics/sherpa {};
16788+
1678716789 ### SCIENCE/PROGRAMMING
1678816790
1678916791 plm = callPackage ../applications/science/programming/plm { };
@@ -17136,6 +17138,8 @@ in
1713617138
1713717139 fastjet = callPackage ../development/libraries/physics/fastjet { };
1713817140
17141+ fastnlo = callPackage ../development/libraries/physics/fastnlo { };
17142+
1713917143 geant4 = callPackage ../development/libraries/physics/geant4 {
1714017144 enableMultiThreading = true;
1714117145 enableG3toG4 = false;
@@ -17168,6 +17172,8 @@ in
1716817172
1716917173 lhapdf = callPackage ../development/libraries/physics/lhapdf { };
1717017174
17175+ mcgrid = callPackage ../development/libraries/physics/mcgrid { };
17176+
1717117177 nlojet = callPackage ../development/libraries/physics/nlojet { };
1717217178
1717317179 pythia = callPackage ../development/libraries/physics/pythia { };