about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2019-04-05 16:09:55 +0000
committerGitHub <noreply@github.com>2019-04-05 16:09:55 +0000
commit058f9fa78a261cbaf193d570e21c0216ef44193a (patch)
tree14f0fc2a2d9a188375b7cef20544e6dadd35e21f
parent8580a0a38fc423851152a363261469ecace1a50a (diff)
parentb1549370274685b8b71a3a8d1020b59904300672 (diff)
downloadnixlib-058f9fa78a261cbaf193d570e21c0216ef44193a.tar
nixlib-058f9fa78a261cbaf193d570e21c0216ef44193a.tar.gz
nixlib-058f9fa78a261cbaf193d570e21c0216ef44193a.tar.bz2
nixlib-058f9fa78a261cbaf193d570e21c0216ef44193a.tar.lz
nixlib-058f9fa78a261cbaf193d570e21c0216ef44193a.tar.xz
nixlib-058f9fa78a261cbaf193d570e21c0216ef44193a.tar.zst
nixlib-058f9fa78a261cbaf193d570e21c0216ef44193a.zip
Merge pull request #58992 from veprbl/pr/herwig_7_1_5
herwig: 7.1.4 -> 7.1.5
-rw-r--r--pkgs/development/libraries/physics/herwig/default.nix6
-rw-r--r--pkgs/development/libraries/physics/thepeg/default.nix4
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix
index 722dccaea7be..7a146bb7309a 100644
--- a/pkgs/development/libraries/physics/herwig/default.nix
+++ b/pkgs/development/libraries/physics/herwig/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "herwig-${version}";
-  version = "7.1.4";
+  version = "7.1.5";
 
   src = fetchurl {
     url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2";
-    sha256 = "1awr1jz0q873x8bgwiilzklhk1zkgm6slvpychpnvsf9vk05mmdx";
+    sha256 = "0jnrv59zfa41gc37pqr3vaiz5jkh7w0k0alcax37b3mlbsnacr9r";
   };
 
   nativeBuildInputs = [ autoconf automake libtool ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     ++ (with lhapdf.pdf_sets; [ MMHT2014lo68cl MMHT2014nlo68cl ]);
 
   postPatch = ''
-    patchShebangs ./cat_with_cpplines
+    patchShebangs ./
   '';
 
   configureFlags = [
diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix
index 63bc3c06e102..046413c64f49 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.1.4";
+  version = "2.1.5";
 
   src = fetchurl {
     url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2";
-    sha256 = "1x9dfxmsbmzmsxrv3cczfyrnqkxjcpy89v6v7ycysrx9k8qkf320";
+    sha256 = "1rmmwhk9abn9mc9j3127axjwpvymv21ld4wcivwz01pldkxh06n6";
   };
 
   buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ];