From 456cf826e01506ecf88bc0740ff3433fa5cc10f6 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 24 Dec 2016 15:16:19 -0500 Subject: [PATCH 1/5] rivet: 2.5.2 -> 2.5.3 --- pkgs/development/libraries/physics/rivet/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 775ee75f61f..b42ee7a3411 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -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 From 9a5e34facad643a6231682db0ed3667a7b437166 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 30 Dec 2016 12:03:52 -0500 Subject: [PATCH 2/5] kakoune: 2016-12-10 -> 2016-12-30, fix on Darwin --- pkgs/applications/editors/kakoune/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 73ee7ed64cd..14b13c394f3 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -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; }; } From 3c3e2dfd0a0a0ee734f9bb733cdf91560c5363bf Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 30 Dec 2016 12:32:03 -0500 Subject: [PATCH 3/5] fastnlo: init at 2.3.1pre-2212 --- .../libraries/physics/fastnlo/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/physics/fastnlo/default.nix diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix new file mode 100644 index 00000000000..70368133706 --- /dev/null +++ b/pkgs/development/libraries/physics/fastnlo/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9842aaede3..cb9e18bdc39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17129,6 +17129,8 @@ in fastjet = callPackage ../development/libraries/physics/fastjet { }; + fastnlo = callPackage ../development/libraries/physics/fastnlo { }; + geant4 = callPackage ../development/libraries/physics/geant4 { enableMultiThreading = true; enableG3toG4 = false; From 8fb6895614e5c69b4994c0299c376bd5041dc6f9 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 30 Dec 2016 12:32:53 -0500 Subject: [PATCH 4/5] sherpa: init at 2.2.1 --- .../science/physics/sherpa/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/applications/science/physics/sherpa/default.nix diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix new file mode 100644 index 00000000000..d863964ad90 --- /dev/null +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb9e18bdc39..768a6c0ce11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16777,6 +16777,8 @@ in sacrifice = callPackage ../applications/science/physics/sacrifice {}; + sherpa = callPackage ../applications/science/physics/sherpa {}; + ### SCIENCE/PROGRAMMING plm = callPackage ../applications/science/programming/plm { }; From 2dd8aea4bbd5b7eb9cc3b9f173de9cfd6ef66e55 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 30 Dec 2016 12:33:51 -0500 Subject: [PATCH 5/5] mcgrid: init at 2.0.2 --- .../libraries/physics/mcgrid/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/physics/mcgrid/default.nix diff --git a/pkgs/development/libraries/physics/mcgrid/default.nix b/pkgs/development/libraries/physics/mcgrid/default.nix new file mode 100644 index 00000000000..033bf2f214f --- /dev/null +++ b/pkgs/development/libraries/physics/mcgrid/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 768a6c0ce11..665d191b577 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17165,6 +17165,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 { };