From 0ae27c1e6d15432dd808d2227b9245f30f8dec01 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 17 Jul 2025 12:00:30 -0700
Subject: [PATCH 1/2] python3Packages.plopp: 25.06.0 -> 25.07.0

changelog: https://github.com/scipp/plopp/releases/tag/25.07.0
diff: https://github.com/scipp/plopp/compare/25.06.0...25.07.0
---
 pkgs/development/python-modules/plopp/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/plopp/default.nix b/pkgs/development/python-modules/plopp/default.nix
index 581dbb51e5d2..606b93b2db1f 100644
--- a/pkgs/development/python-modules/plopp/default.nix
+++ b/pkgs/development/python-modules/plopp/default.nix
@@ -35,7 +35,7 @@
 
 buildPythonPackage rec {
   pname = "plopp";
-  version = "25.06.0";
+  version = "25.07.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -104,6 +104,11 @@ buildPythonPackage rec {
       };
   };
 
+  pytestFlagsArray = [
+    # https://github.com/scipp/plopp/issues/472
+    "-Wignore::DeprecationWarning"
+  ];
+
   pythonImportsCheck = [
     "plopp"
   ];

From 806bd5a1085526abec84d5fa0f82660ee78a40a1 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 18 Jul 2025 18:36:49 +0300
Subject: [PATCH 2/2] python313Packages.plopp: merge upstram patch to fix
 deprecation warnings

---
 pkgs/development/python-modules/plopp/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/plopp/default.nix b/pkgs/development/python-modules/plopp/default.nix
index 606b93b2db1f..50056b6c4f43 100644
--- a/pkgs/development/python-modules/plopp/default.nix
+++ b/pkgs/development/python-modules/plopp/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
 
   # build-system
   setuptools,
@@ -44,6 +45,13 @@ buildPythonPackage rec {
     tag = version;
     hash = "sha256-SwF0bUU/DAAJ5+0WvZgwqEw6IoaqdbKj0GkCgffGclA=";
   };
+  patches = [
+    # https://github.com/scipp/plopp/issues/472
+    (fetchpatch {
+      url = "https://github.com/scipp/plopp/commit/7af8cbee85796005f2fea79171ae44aba9a8cfc7.patch";
+      hash = "sha256-uyCV/2tSvcnnw+ak6fT99ru+UrTZXsS3b4YGeXVykAY=";
+    })
+  ];
 
   build-system = [
     setuptools
@@ -104,11 +112,6 @@ buildPythonPackage rec {
       };
   };
 
-  pytestFlagsArray = [
-    # https://github.com/scipp/plopp/issues/472
-    "-Wignore::DeprecationWarning"
-  ];
-
   pythonImportsCheck = [
     "plopp"
   ];