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: 9f351070a1b5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: babf5477f539
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 28, 2020

  1. sherpa: 2.2.8 -> 2.2.9

    veprbl committed Apr 28, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    veprbl Dmitry Kalinkin
    Copy the full SHA
    ae06851 View commit details

Commits on Apr 29, 2020

  1. Merge pull request #86251 from veprbl/pr/sherpa_2_2_9

    sherpa: 2.2.8 -> 2.2.9
    veprbl authored Apr 29, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    babf547 View commit details
Showing with 7 additions and 9 deletions.
  1. +7 −9 pkgs/applications/science/physics/sherpa/default.nix
16 changes: 7 additions & 9 deletions pkgs/applications/science/physics/sherpa/default.nix
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
pname = "sherpa";
version = "2.2.8";
version = "2.2.9";

src = fetchurl {
url = "https://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz";
sha256 = "1al1imdrknvbcy8k113xysc14lln4msbv281bf0kx7p73wz59mv3";
sha256 = "1z7vws97k6zfzyqx0dkv2kq8d83dibi73i5jiqk5a22yplp6bnjh";
};

buildInputs = [ gfortran sqlite lhapdf rivet ];
@@ -21,13 +21,11 @@ stdenv.mkDerivation rec {
"--enable-rivet=${rivet}"
];

CXXFLAGS = "-std=c++11"; # needed for rivet on OSX

meta = {
meta = with stdenv.lib; {
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://gitlab.com/sherpa-team/sherpa";
platforms = stdenv.lib.platforms.unix;
maintainers = with stdenv.lib.maintainers; [ veprbl ];
license = licenses.gpl2;
homepage = "https://gitlab.com/sherpa-team/sherpa";
platforms = platforms.unix;
maintainers = with maintainers; [ veprbl ];
};
}