Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8580a0a38fc4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 058f9fa78a26
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Apr 5, 2019

  1. herwig: 7.1.4 -> 7.1.5 

    thepeg: 2.1.4 -> 2.1.5
    @veprbl
    veprbl committed Apr 5, 2019
    Copy the full SHA
    b154937 View commit details

  2. Merge pull request #58992 from veprbl/pr/herwig_7_1_5 

    herwig: 7.1.4 -> 7.1.5
    @globin
    globin authored Apr 5, 2019
    Copy the full SHA
    058f9fa View commit details
Showing with 5 additions and 5 deletions.
  1. +3 −3 pkgs/development/libraries/physics/herwig/default.nix
  2. +2 −2 pkgs/development/libraries/physics/thepeg/default.nix
6 changes: 3 additions & 3 deletions pkgs/development/libraries/physics/herwig/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 = [
4 changes: 2 additions & 2 deletions pkgs/development/libraries/physics/thepeg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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 ];