From c09e7c4629d262bce0aa1625b1a4d1ffcb1a0393 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 20:33:12 +0200 Subject: [PATCH 1/3] python312Packages.pynmea2: refactor --- .../python-modules/pynmea2/default.nix | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pynmea2/default.nix b/pkgs/development/python-modules/pynmea2/default.nix index 2bfdd61a6202..972bbee4a9f9 100644 --- a/pkgs/development/python-modules/pynmea2/default.nix +++ b/pkgs/development/python-modules/pynmea2/default.nix @@ -1,22 +1,39 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, setuptools +, pythonOlder +}: buildPythonPackage rec { pname = "pynmea2"; version = "1.19.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-Hap5uTJ5+IfRwjXlzFx54yZEVkE4zkaYmrD0ovyXDXw="; }; - nativeCheckInputs = [ pytestCheckHook ]; + build-system = [ + setuptools + ]; - pythonImportsCheck = [ "pynmea2" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pynmea2" + ]; meta = { - homepage = "https://github.com/Knio/pynmea2"; description = "Python library for the NMEA 0183 protcol"; + homepage = "https://github.com/Knio/pynmea2"; + changelog = "https://github.com/Knio/pynmea2/releases/tag/${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ oxzi ]; }; From cff14ad57255c0be7dd20359c2507cb01dc02a7f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 20:33:42 +0200 Subject: [PATCH 2/3] python312Packages.pynmea2: add patch to remove imp --- pkgs/development/python-modules/pynmea2/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/pynmea2/default.nix b/pkgs/development/python-modules/pynmea2/default.nix index 972bbee4a9f9..30b2ac658624 100644 --- a/pkgs/development/python-modules/pynmea2/default.nix +++ b/pkgs/development/python-modules/pynmea2/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , pytestCheckHook , setuptools , pythonOlder @@ -18,6 +19,15 @@ buildPythonPackage rec { hash = "sha256-Hap5uTJ5+IfRwjXlzFx54yZEVkE4zkaYmrD0ovyXDXw="; }; + patches = [ + # Removed depreciated imp and replaced with importlib, https://github.com/Knio/pynmea2/pull/164 + (fetchpatch { + name = "remove-imp.patch"; + url = "https://github.com/Knio/pynmea2/commit/c56717b5e859e978ad3b52b8f826faa5d50489f8.patch"; + hash = "sha256-jeFyfukT+0NLNxvNCxL7TzL/8oKmKOam5ZUIvjdvN/Q="; + }) + ]; + build-system = [ setuptools ]; From ab8373bf628ef54df8a34d15812c25119bb394f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 18 May 2024 20:34:04 +0200 Subject: [PATCH 3/3] python312Packages.pynmea2: format with nixfmt --- .../python-modules/pynmea2/default.nix | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/pynmea2/default.nix b/pkgs/development/python-modules/pynmea2/default.nix index 30b2ac658624..e4e9f37d2f50 100644 --- a/pkgs/development/python-modules/pynmea2/default.nix +++ b/pkgs/development/python-modules/pynmea2/default.nix @@ -1,10 +1,11 @@ -{ lib -, buildPythonPackage -, fetchPypi -, fetchpatch -, pytestCheckHook -, setuptools -, pythonOlder +{ + lib, + buildPythonPackage, + fetchPypi, + fetchpatch, + pytestCheckHook, + setuptools, + pythonOlder, }: buildPythonPackage rec { @@ -28,17 +29,11 @@ buildPythonPackage rec { }) ]; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "pynmea2" - ]; + pythonImportsCheck = [ "pynmea2" ]; meta = { description = "Python library for the NMEA 0183 protcol";