From 116108e2b690e716e1c5f349d5c92c5d2963b1ae Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 23 Feb 2021 23:56:37 -0500 Subject: [PATCH 1/2] herwig: 7.2.1 -> 7.2.2 thepeg: 2.2.1 -> 2.2.2 --- pkgs/development/libraries/physics/herwig/default.nix | 4 ++-- pkgs/development/libraries/physics/thepeg/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index d3f6bcb7474..69a8c781d5b 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "herwig"; - version = "7.2.1"; + version = "7.2.2"; src = fetchurl { url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; - sha256 = "11m6xvardnk0i8x8b3dpwg4c4ncq0xmlfg2n5r5qmh6544pz7zyl"; + sha256 = "10y3fb33zsinr0z3hzap9rsbcqhy1yjqnv4b4vz21g7mdlw6pq2k"; }; nativeBuildInputs = [ autoconf automake libtool ]; diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index d5a272955f4..031277f8e0c 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "thepeg"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; - sha256 = "13x5gssv22mpa2w6i0vaalwcr57170vh3b4xrw8mrm3abqhwgav3"; + sha256 = "0gif4vb9lw2px2qdywqm7x0frbv0h5gq9lq36c50f2hv77a5bgwp"; }; buildInputs = [ boost fastjet gsl hepmc2 lhapdf rivet zlib ]; From 669c286d27cfc2c6a5a714b94fc0f8c1871fa835 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 24 Feb 2021 00:30:11 -0500 Subject: [PATCH 2/2] herwig,thepeg: mark as gpl3Only --- pkgs/development/libraries/physics/herwig/default.nix | 2 +- pkgs/development/libraries/physics/thepeg/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index 69a8c781d5b..0a7e9b4d948 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A multi-purpose particle physics event generator"; homepage = "https://herwig.hepforge.org/"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ veprbl ]; platforms = platforms.unix; broken = stdenv.isAarch64; # doesn't compile: ignoring return value of 'FILE* freopen... diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 031277f8e0c..ed92889b5b2 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Toolkit for High Energy Physics Event Generation"; homepage = "https://herwig.hepforge.org/"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ veprbl ]; platforms = platforms.unix; };