Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/pkgs/build-support/go/module.nix

1 files changed, 10 insertions, 1 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/ndeflib/default.nix b/nixpkgs/pkgs/development/python-modules/ndeflib/default.nix
index 3699955627ec..165aed8942df 100644
--- a/nixpkgs/pkgs/development/python-modules/ndeflib/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ndeflib/default.nix
@@ -2,13 +2,15 @@
 , buildPythonPackage
 , fetchFromGitHub
 , pytestCheckHook
+, pythonAtLeast
 , pythonOlder
+, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "ndeflib";
   version = "0.3.3";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -19,6 +21,10 @@ buildPythonPackage rec {
     hash = "sha256-cpfztE+/AW7P0J7QeTDfVGYc2gEkr7gzA352hC9bdTM=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   nativeCheckInputs = [
     pytestCheckHook
   ];
@@ -30,11 +36,14 @@ buildPythonPackage rec {
   disabledTests = [
     # AssertionError caused due to wrong size
     "test_decode_error"
+  ] ++ lib.optionals (pythonAtLeast "3.12") [
+    "test_encode_error"
   ];
 
   meta = with lib; {
     description = "Python package for parsing and generating NFC Data Exchange Format messages";
     homepage = "https://github.com/nfcpy/ndeflib";
+    changelog = "https://github.com/nfcpy/ndeflib/releases/tag/v${version}";
     license = licenses.isc;
     maintainers = with maintainers; [ fab ];
   };