diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix
index 7e81354ceae0..f9aafffd0905 100644
--- a/pkgs/development/python-modules/pyyaml/default.nix
+++ b/pkgs/development/python-modules/pyyaml/default.nix
@@ -3,43 +3,39 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
-  cython_0,
+  cython,
   setuptools,
   libyaml,
-  python,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pyyaml";
-  version = "6.0.1";
+  version = "6.0.2";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
-
-  format = "pyproject";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "yaml";
     repo = "pyyaml";
-    rev = version;
-    hash = "sha256-YjWMyMVDByLsN5vEecaYjHpR1sbBey1L/khn4oH9SPA=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-IQoZd9Lp0ZHLAQN3PFwMsZVTsIVJyIaT9D6fpkzA8IA=";
   };
 
-  nativeBuildInputs = [
-    cython_0
+  build-system = [
+    cython
     setuptools
   ];
 
   buildInputs = [ libyaml ];
 
-  checkPhase = ''
-    runHook preCheck
-    PYTHONPATH="tests/lib:$PYTHONPATH" ${python.interpreter} -m test_all
-    runHook postCheck
-  '';
-
   pythonImportsCheck = [ "yaml" ];
 
+  nativeCheckInputs = [ pytestCheckHook ];
+
   meta = with lib; {
+    changelog = "https://github.com/yaml/pyyaml/blob/${src.rev}/CHANGES";
     description = "Next generation YAML parser and emitter for Python";
     homepage = "https://github.com/yaml/pyyaml";
     license = licenses.mit;