From c60161bcbe8345c35656d944077ca8e6547c1334 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 1 May 2024 06:23:21 -0400 Subject: [PATCH] jana2: 2.2.0 -> 2.2.0 (retagged) --- flake.lock | 6 +++--- pkgs/jana2/DecodeDASSource_fix.patch | 12 ++++++++++++ pkgs/jana2/default.nix | 2 +- pkgs/jana2/fix_for_clang.patch | 28 ---------------------------- 4 files changed, 16 insertions(+), 32 deletions(-) create mode 100644 pkgs/jana2/DecodeDASSource_fix.patch delete mode 100644 pkgs/jana2/fix_for_clang.patch diff --git a/flake.lock b/flake.lock index 1a5959a..8afc255 100644 --- a/flake.lock +++ b/flake.lock @@ -138,11 +138,11 @@ "jana2-src": { "flake": false, "locked": { - "lastModified": 1714000496, - "narHash": "sha256-Kx5S2QxstAQF4djmUwB+TO833ZxeOWgdBvEhf2CRnbE=", + "lastModified": 1714542117, + "narHash": "sha256-EQRRK+iTyLLRLEl0rDGCo7JK8/Fk+CQom3i7h8aZ7BM=", "owner": "JeffersonLab", "repo": "JANA2", - "rev": "59c2a54b77ba9c9e3bfae3c33b442206749f7310", + "rev": "94f97925004550e765f2f6eef140eade2f16e386", "type": "github" }, "original": { diff --git a/pkgs/jana2/DecodeDASSource_fix.patch b/pkgs/jana2/DecodeDASSource_fix.patch new file mode 100644 index 0000000..99fa4d1 --- /dev/null +++ b/pkgs/jana2/DecodeDASSource_fix.patch @@ -0,0 +1,12 @@ +diff --git a/src/plugins/streamDet/DecodeDASSource.h b/src/plugins/streamDet/DecodeDASSource.h +--- a/src/plugins/streamDet/DecodeDASSource.h ++++ b/src/plugins/streamDet/DecodeDASSource.h +@@ -16,7 +16,7 @@ class DecodeDASSource : public JEventSource { + public: + + // constructors and destructors +- DecodeDASSource(); ++ DecodeDASSource(std::string source_name, JApplication* app); + ~DecodeDASSource() override; + + // define public methods diff --git a/pkgs/jana2/default.nix b/pkgs/jana2/default.nix index 17a0a15..e900cb0 100644 --- a/pkgs/jana2/default.nix +++ b/pkgs/jana2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = jana2-src; patches = [ - ./fix_for_clang.patch + ./DecodeDASSource_fix.patch ]; postPatch = '' diff --git a/pkgs/jana2/fix_for_clang.patch b/pkgs/jana2/fix_for_clang.patch deleted file mode 100644 index 9b584f5..0000000 --- a/pkgs/jana2/fix_for_clang.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 560cbb008e628794f30c668651de40c21af43e68 -Author: Dmitry Kalinkin -Date: Mon Apr 29 20:52:15 2024 -0400 - - Fix "error: use template keyword to treat GetCollection as a dependent template name" - -diff --git a/src/libraries/JANA/Omni/JHasInputs.h b/src/libraries/JANA/Omni/JHasInputs.h -index 7c6161ba..94508807 100644 ---- a/src/libraries/JANA/Omni/JHasInputs.h -+++ b/src/libraries/JANA/Omni/JHasInputs.h -@@ -213,7 +213,7 @@ protected: - } - else { - if (this->is_optional && !event.HasParent(level)) return; -- m_data.push_back(event.GetParent(level).GetCollection(coll_name, !this->is_optional)); -+ m_data.push_back(event.GetParent(level).template GetCollection(coll_name, !this->is_optional)); - } - } - } -@@ -230,7 +230,7 @@ protected: - } - else { - if (this->is_optional && !event.HasParent(level)) return; -- event.GetParent(level).GetCollection(coll_name, !this->is_optional); -+ event.GetParent(level).template GetCollection(coll_name, !this->is_optional); - } - } - }