Skip to content

Commit 8b24638

Browse files
emarynemaryn
andauthored
sherpa: 2.2.16 -> 3.0.1 (#385906)
Co-authored-by: emaryn <[email protected]>
1 parent 1639f1f commit 8b24638

File tree

1 file changed

+23
-24
lines changed

1 file changed

+23
-24
lines changed

pkgs/by-name/sh/sherpa/package.nix

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
{
22
lib,
33
stdenv,
4-
fetchurl,
4+
fetchFromGitLab,
55
autoconf,
66
gfortran,
7-
hepmc3,
8-
fastjet,
7+
cmake,
8+
libzip,
9+
pkg-config,
910
lhapdf,
10-
rivet,
11-
sqlite,
11+
autoPatchelfHook,
1212
}:
1313

1414
stdenv.mkDerivation rec {
1515
pname = "sherpa";
16-
version = "2.2.16";
16+
version = "3.0.1";
1717

18-
src = fetchurl {
19-
url = "https://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz";
20-
sha256 = "sha256-AntSN5BhtJFuDBoOFvrzoCr/W4SnX5CeAXiTcz9MjUs=";
18+
src = fetchFromGitLab {
19+
owner = "sherpa-team";
20+
repo = "sherpa";
21+
tag = "v${version}";
22+
hash = "sha256-zrtu4LJIzNdUGmnQlvZytYgzESo8eYQIdfxBABgUbzs=";
2123
};
2224

2325
postPatch = lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
@@ -27,31 +29,28 @@ stdenv.mkDerivation rec {
2729
nativeBuildInputs = [
2830
autoconf
2931
gfortran
32+
cmake
33+
pkg-config
34+
autoPatchelfHook
3035
];
3136

3237
buildInputs = [
33-
sqlite
38+
libzip
3439
lhapdf
35-
rivet
3640
];
3741

3842
enableParallelBuilding = true;
3943

40-
configureFlags = [
41-
"--with-sqlite3=${sqlite.dev}"
42-
"--enable-hepmc3=${hepmc3}"
43-
"--enable-fastjet=${fastjet}"
44-
"--enable-lhapdf=${lhapdf}"
45-
"--enable-rivet=${rivet}"
46-
"--enable-pythia"
47-
];
44+
preFixup = ''
45+
patchelf --add-rpath $out/lib/SHERPA-MC $out/bin/Sherpa
46+
'';
4847

49-
meta = with lib; {
50-
description = "Simulation of High-Energy Reactions of PArticles in lepton-lepton, lepton-photon, photon-photon, lepton-hadron and hadron-hadron collisions";
51-
license = licenses.gpl2;
48+
meta = {
49+
description = "Monte Carlo event generator for the Simulation of High-Energy Reactions of PArticles";
50+
license = lib.licenses.gpl3Plus;
5251
homepage = "https://gitlab.com/sherpa-team/sherpa";
53-
platforms = platforms.unix;
54-
maintainers = with maintainers; [ veprbl ];
52+
platforms = lib.platforms.unix;
53+
maintainers = with lib.maintainers; [ veprbl ];
5554
# never built on aarch64-darwin since first introduction in nixpkgs
5655
broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
5756
};

0 commit comments

Comments
 (0)