1 files changed, 17 insertions, 18 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/ruyaml/default.nix b/nixpkgs/pkgs/development/python-modules/ruyaml/default.nix
index e5b2108831df..4131200f2276 100644
--- a/nixpkgs/pkgs/development/python-modules/ruyaml/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/ruyaml/default.nix
@@ -11,32 +11,23 @@
 buildPythonPackage rec {
   pname = "ruyaml";
   version = "0.91.0";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "pycontribs";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "0gxvwry7n1gczxkjzyfrr3fammllkvnnamja4yln8xrg3n1h89al";
+    repo = "ruyaml";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-A37L/voBrn2aZ7xT8+bWdZJxbWRjnxbstQtSyUeN1sA=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "remove-setuptools-scm-git-archive-from-setupcfg.patch";
-      url = "https://github.com/pycontribs/ruyaml/commit/8922dd826cbb97b29e9826b00fb28a65d584e985.patch";
-      includes = [ "setup.cfg" ];
-      hash = "sha256-XAsORoPvYRElHswlZ4S377UwuJNCU1JuCz5iyFXoXOQ=";
-    })
-
+  postPatch = ''
     # https://github.com/pycontribs/ruyaml/pull/107
-    (fetchpatch {
-      name = "remove-setuptools-scm-git-archive-from-pyproject.patch";
-      url = "https://github.com/pycontribs/ruyaml/commit/4d605bf63f799696c8ba3c1f0a0f505db0ca33ce.patch";
-      hash = "sha256-X6HWXBot5ZIo+odoSHhXMb03tgpQfRw/Ze8nFgH43ZI=";
-    })
-  ];
+    substituteInPlace pyproject.toml \
+      --replace '"pip >= 19.3.1",' "" \
+      --replace '"setuptools_scm_git_archive >= 1.1",' ""
+  '';
 
   nativeBuildInputs = [
     setuptools-scm
@@ -58,9 +49,17 @@ buildPythonPackage rec {
     "ruyaml"
   ];
 
+  disabledTests = [
+    # Assertion error
+    "test_issue_60"
+    "test_issue_60_1"
+    "test_issue_61"
+  ];
+
   meta = with lib; {
     description = "YAML 1.2 loader/dumper package for Python";
     homepage = "https://ruyaml.readthedocs.io/";
+    changelog = "https://github.com/pycontribs/ruyaml/releases/tag/v${version}";
     license = with licenses; [ mit ];
     maintainers = with maintainers; [ fab ];
   };