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

1 files changed, 10 insertions, 3 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/pytest-json-report/default.nix b/nixpkgs/pkgs/development/python-modules/pytest-json-report/default.nix
index 335f2de30a84..f3b556699e8b 100644
--- a/nixpkgs/pkgs/development/python-modules/pytest-json-report/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pytest-json-report/default.nix
@@ -6,22 +6,27 @@
 , pytest-xdist
 , pytestCheckHook
 , pythonOlder
+, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "pytest-json-report";
   version = "1.5.0";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "numirias";
-    repo = pname;
-    rev = "v${version}";
+    repo = "pytest-json-report";
+    rev = "refs/tags/v${version}";
     hash = "sha256-hMB/atDuo7CjwhHFUOxVfgJ7Qp4AA9J428iv7hyQFcs=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
   buildInputs = [
     pytest
   ];
@@ -38,6 +43,7 @@ buildPythonPackage rec {
   disabledTests = [
     # pytest-flaky is not available at the moment
     "test_bug_31"
+    "test_environment_via_metadata_plugin"
   ];
 
   pythonImportsCheck = [
@@ -47,6 +53,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Pytest plugin to report test results as JSON";
     homepage = "https://github.com/numirias/pytest-json-report";
+    changelog = "https://github.com/numirias/pytest-json-report/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };