From 6bcc20361f5a5cd4a54ecadd7343d5e319a92569 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 14 Jul 2017 20:46:00 -0400
Subject: herwig: 7.0.4 -> 7.1.1, thepeg: 2.0.3 -> 2.1.1

---
 pkgs/development/libraries/physics/herwig/default.nix | 18 ++++--------------
 pkgs/development/libraries/physics/thepeg/default.nix |  4 ++--
 2 files changed, 6 insertions(+), 16 deletions(-)

(limited to 'pkgs/development/libraries')

diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix
index 737565d298e0..407be5c5e4a4 100644
--- a/pkgs/development/libraries/physics/herwig/default.nix
+++ b/pkgs/development/libraries/physics/herwig/default.nix
@@ -2,31 +2,21 @@
 
 stdenv.mkDerivation rec {
   name = "herwig-${version}";
-  version = "7.0.4";
+  version = "7.1.1";
 
   src = fetchurl {
     url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2";
-    sha256 = "1vac5y5cyyn1z1ii1a6x1ysx2znxmfq9a51gxqib0i19mrn5y9p6";
+    sha256 = "13xaykwr7x6mp2bi22wz6dyzx3dxhcv6aw9cg8p29bh9l890g63j";
   };
 
-  patches = [
-    # Otherwise it causes an error
-    # lib/Herwig/HwMatchboxScales.so: undefined symbol: _Z8renScaleSt6vectorIN6ThePEG14Lorentz5VectorIdEESaIS2_EES4_S4_
-    (fetchpatch {
-      url = "https://herwig.hepforge.org/hg/herwig/rev/fe543583fa02?style=raw";
-      sha256 = "1y6a9q93wicw3c73xni74w5k25vidgcr60ffi2b2ymhb390jas83";
-    })
-  ];
-
   nativeBuildInputs = [ autoconf automake libtool ];
 
   buildInputs = [ boost fastjet gfortran gsl thepeg zlib ]
     # There is a bug that requires for MMHT PDF's to be presend during the build
     ++ (with lhapdf.pdf_sets; [ MMHT2014lo68cl MMHT2014nlo68cl ]);
 
-  preConfigure = ''
-    # needed for the patch above
-    autoreconf -i
+  postPatch = ''
+    patchShebangs ./cat_with_cpplines
   '';
 
   configureFlags = [
diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix
index 1216c34cdb8e..7989eb518c78 100644
--- a/pkgs/development/libraries/physics/thepeg/default.nix
+++ b/pkgs/development/libraries/physics/thepeg/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "thepeg-${version}";
-  version = "2.0.3";
+  version = "2.1.1";
 
   src = fetchurl {
     url = "http://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2";
-    sha256 = "0d26linwv92iq23n4gx154jvyd0lz5vg41kf4nxa01nspy7scyy5";
+    sha256 = "1082n4q036sah5r4asyl3hpcyc05cymg40dnk3jsdjgv2v0vvc71";
   };
 
   buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ];
-- 
cgit 1.4.1