diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix new file mode 100644 index 00000000000..bece84faf21 --- /dev/null +++ b/pkgs/development/libraries/physics/nlojet/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, fetchpatch }: + +stdenv.mkDerivation rec { + name = "nlojet++"; + version = "4.1.3"; + + src = fetchurl { + url = "http://desy.de/~znagy/hep-programs/nlojet++/nlojet++-${version}.tar.gz"; + sha256 = "18qfn5kjzvnyh29x40zm2maqzfmrnay9r58n8pfpq5lcphdhhv8p"; + }; + + patches = [ + ./nlojet_clang_fix.patch + ]; + + meta = { + homepage = "http://www.desy.de/~znagy/Site/NLOJet++.html"; + license = stdenv.lib.licenses.gpl2; + description = "Implementation of calculation of the hadron jet cross sections"; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch b/pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch new file mode 100644 index 00000000000..917c57e8cb4 --- /dev/null +++ b/pkgs/development/libraries/physics/nlojet/nlojet_clang_fix.patch @@ -0,0 +1,30 @@ +diff -rupN nlojet++-4.1.3-orig/nlo-hep/hep-lorentz/bits/hep-lorentzvector_complex.h nlojet++-4.1.3/nlo-hep/hep-lorentz/bits/hep-lorentzvector_complex.h +--- nlojet++-4.1.3-orig/nlo-hep/hep-lorentz/bits/hep-lorentzvector_complex.h 2010-05-11 11:06:00.000000000 -0400 ++++ nlojet++-4.1.3/nlo-hep/hep-lorentz/bits/hep-lorentzvector_complex.h 2014-08-23 03:22:51.000000000 -0400 +@@ -26,8 +26,11 @@ + namespace nlo { + + // Spacializations ++ template<> + class lorentzvector >; ++ template<> + class lorentzvector >; ++ template<> + class lorentzvector >; + + template<> +diff -rupN nlojet++-4.1.3-orig/nlo-hep/hep-lorentz/bits/hep-threevector_complex.h nlojet++-4.1.3/nlo-hep/hep-lorentz/bits/hep-threevector_complex.h +--- nlojet++-4.1.3-orig/nlo-hep/hep-lorentz/bits/hep-threevector_complex.h 2010-05-11 11:06:00.000000000 -0400 ++++ nlojet++-4.1.3/nlo-hep/hep-lorentz/bits/hep-threevector_complex.h 2014-08-23 03:23:09.000000000 -0400 +@@ -26,8 +26,11 @@ + namespace nlo { + + // Specializations ++ template<> + class threevector >; ++ template<> + class threevector >; ++ template<> + class threevector >; + + template<> diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a36ba245027..cf9d2daaf5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16727,6 +16727,8 @@ in lhapdf = callPackage ../development/libraries/physics/lhapdf { }; + nlojet = callPackage ../development/libraries/physics/nlojet { }; + pythia = callPackage ../development/libraries/physics/pythia { }; rivet = callPackage ../development/libraries/physics/rivet { };