From 7f997e6a8147174a51335118f3cc999f20fb0c97 Mon Sep 17 00:00:00 2001
From: Pyrox <pyrox@pyrox.dev>
Date: Mon, 29 Jul 2024 00:10:22 -0400
Subject: [PATCH 1/2] python312Packages.http-ece: 1.2.0 -> 1.2.1

Also drops the nose dependency and moves to pytest
---
 .../python-modules/http-ece/default.nix       | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/http-ece/default.nix b/pkgs/development/python-modules/http-ece/default.nix
index 66dd40712ded0..307a7b1f4d5e1 100644
--- a/pkgs/development/python-modules/http-ece/default.nix
+++ b/pkgs/development/python-modules/http-ece/default.nix
@@ -2,41 +2,36 @@
   lib,
   buildPythonPackage,
   cryptography,
-  fetchPypi,
-  mock,
-  nose,
-  pythonOlder,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
+  pytest-cov-stub,
 }:
 
 buildPythonPackage rec {
   pname = "http-ece";
-  version = "1.2.0";
+  version = "1.2.1";
 
-  src = fetchPypi {
-    pname = "http_ece";
-    inherit version;
-    hash = "sha256-tZIPjvuOG1+wJXE+Ozb9pUM2JiAQY0sm3B+Y+F0es94=";
+  src = fetchFromGitHub {
+    owner = "web-push-libs";
+    repo = "encrypted-content-encoding";
+    rev = version;
+    hash = "sha256-HjXJWoOvCVOdEto4Ss4HPUuf+uNcQkfvj/cxJGHOhQ8=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace-fail '"nose",' "" \
-      --replace-fail '"coverage",' ""
-  '';
+  sourceRoot = "${src.name}/python";
 
   propagatedBuildInputs = [ cryptography ];
 
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = [
-    mock
-    nose
+    pytestCheckHook
+    pytest-cov-stub
   ];
 
   meta = with lib; {
     description = "Encipher HTTP Messages";
-    homepage = "https://github.com/martinthomson/encrypted-content-encoding";
-    license = licenses.mit;
-    maintainers = with maintainers; [ peterhoeg ];
+    homepage = "https://github.com/web-push-libs/encrypted-content-encoding";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ peterhoeg ];
   };
 }

From 0c54982fa16962b9687563c81c73c61e6162bbc4 Mon Sep 17 00:00:00 2001
From: Pyrox <pyrox@pyrox.dev>
Date: Wed, 31 Jul 2024 12:40:27 -0400
Subject: [PATCH 2/2] python312Packages.http-ece: modernize

---
 pkgs/development/python-modules/http-ece/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/http-ece/default.nix b/pkgs/development/python-modules/http-ece/default.nix
index 307a7b1f4d5e1..d4010abc52426 100644
--- a/pkgs/development/python-modules/http-ece/default.nix
+++ b/pkgs/development/python-modules/http-ece/default.nix
@@ -11,6 +11,7 @@
 buildPythonPackage rec {
   pname = "http-ece";
   version = "1.2.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "web-push-libs";
@@ -21,14 +22,16 @@ buildPythonPackage rec {
 
   sourceRoot = "${src.name}/python";
 
-  propagatedBuildInputs = [ cryptography ];
+  build-system = [ setuptools ];
+
+  dependencies = [ cryptography ];
 
   nativeCheckInputs = [
     pytestCheckHook
     pytest-cov-stub
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Encipher HTTP Messages";
     homepage = "https://github.com/web-push-libs/encrypted-content-encoding";
     license = lib.licenses.mit;