From b0486f317119a6135d9b50b500a898d5a822bf2d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 7 Oct 2020 20:28:19 -0400 Subject: [PATCH] pythia: 8.244 -> 8.303 --- .../science/physics/sacrifice/default.nix | 1 + .../physics/sacrifice/pythia83xx.patch | 55 +++++++++++++++++++ .../libraries/physics/pythia/default.nix | 4 +- 3 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/science/physics/sacrifice/pythia83xx.patch diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index 609fea9f7dca..2c4757d92e49 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation { patches = [ ./compat.patch + ./pythia83xx.patch ]; preConfigure = '' diff --git a/pkgs/applications/science/physics/sacrifice/pythia83xx.patch b/pkgs/applications/science/physics/sacrifice/pythia83xx.patch new file mode 100644 index 000000000000..ea162e30c9a8 --- /dev/null +++ b/pkgs/applications/science/physics/sacrifice/pythia83xx.patch @@ -0,0 +1,55 @@ +diff --git a/include/Sacrifice/UserHooksFactory.hh b/include/Sacrifice/UserHooksFactory.hh +index 04b105b..19f2b4f 100644 +--- a/include/Sacrifice/UserHooksFactory.hh ++++ b/include/Sacrifice/UserHooksFactory.hh +@@ -12,7 +12,7 @@ + + namespace Sacrifice{ + +- using Pythia8::UserHooks; ++ using Pythia8::UserHooksPtr; + using std::string; + using std::map; + +@@ -21,7 +21,7 @@ namespace Sacrifice{ + + public: + +- static UserHooks* create(const string &hookName); ++ static UserHooksPtr create(const string &hookName); + + /** + * Loads a library of UserHooks +@@ -39,7 +39,7 @@ namespace Sacrifice{ + + class ICreator{ + public: +- virtual UserHooks *create() const = 0; ++ virtual UserHooksPtr create() const = 0; + virtual ~ICreator(){}; + }; + +@@ -61,8 +61,8 @@ namespace Sacrifice{ + } + } + +- UserHooks *create()const{ +- return new T; ++ UserHooksPtr create()const{ ++ return std::make_shared(); + } + + private: +diff --git a/src/UserHooksFactory.cxx b/src/UserHooksFactory.cxx +index 84a485b..5274119 100644 +--- a/src/UserHooksFactory.cxx ++++ b/src/UserHooksFactory.cxx +@@ -11,7 +11,7 @@ namespace Sacrifice{ + using std::ifstream; + + ////////////////////////////////////////////////////////////////////////////// +- UserHooks *UserHooksFactory::create(const string &name){ ++ UserHooksPtr UserHooksFactory::create(const string &name){ + map::const_iterator it = s_creators().find(name); + if(it == s_creators().end()){ + //eek! diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index c10e81b9a0e8..3105476c8429 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.244"; + version = "8.303"; src = fetchurl { url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "1jlj9hgmk2gcm5p0zqsiz0dpv9vvj8ip261si7frrwfsk7wq0j73"; + sha256 = "0gli6zf8931i7kyminppisc9d0q69xxnalvhld5fgnkh4q82nz6d"; }; buildInputs = [ boost fastjet hepmc2 zlib rsync lhapdf ];