From 6ea85eab40e8ff34a1f3d304b33ff30c2e374c19 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 3 May 2021 17:45:36 -0400 Subject: [PATCH 1/3] pythia: 8.304 -> 8.305 --- pkgs/development/libraries/physics/pythia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 48fc95e788a..9117ddc55d5 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pythia"; - version = "8.304"; + version = "8.305"; src = fetchurl { url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "18frx7xyvxnz57fxjncjyjzsk169h0jz6hxzjfpmwm3dzcc712fk"; + sha256 = "03rpy2bmx67217fh1spfn36x9xrk0igcj56byki77lgj0y5mz21a"; }; buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ]; From 5a57d961498773e4c22f81d4b1744b0d9e79846d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 3 May 2021 17:46:02 -0400 Subject: [PATCH 2/3] pythia8: update meta --- pkgs/development/libraries/physics/pythia/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 9117ddc55d5..07bcca869b6 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { + meta = with lib; { description = "A program for the generation of high-energy physics events"; - license = lib.licenses.gpl2; - homepage = "http://home.thep.lu.se/~torbjorn/Pythia.html"; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ veprbl ]; + license = licenses.gpl2Only; + homepage = "http://home.thep.lu.se/~torbjorn/Pythia.html"; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; }; } From 2d4dcb03bb4aae1d08c79a76c32ff45dd73cc414 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 3 May 2021 18:16:33 -0400 Subject: [PATCH 3/3] pythia: move rsync to nativeBuildInputs --- pkgs/development/libraries/physics/pythia/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index 07bcca869b6..8a58cd638b9 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "03rpy2bmx67217fh1spfn36x9xrk0igcj56byki77lgj0y5mz21a"; }; - buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ]; + nativeBuildInputs = [ rsync ]; + buildInputs = [ boost fastjet hepmc zlib lhapdf ]; preConfigure = '' patchShebangs ./configure