From 3c032f0011d64131a66a3b60200edd5ad1cc78da Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 12 Dec 2017 11:32:17 +0100 Subject: [PATCH] pythonPackages.ruamel_yaml: enable build for Python2 --- pkgs/top-level/python-packages.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4d6dcc396b0..ed197996342 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17544,9 +17544,6 @@ in { name = "ruamel.yaml-${version}"; version = "0.13.7"; - # needs ruamel_ordereddict for python2 support - disabled = !isPy3k; - src = pkgs.fetchurl { url = "mirror://pypi/r/ruamel.yaml/${name}.tar.gz"; sha256 = "1vca2552k0kmhr9msg1bbfdvp3p9im17x1a6npaw221vlgg15z7h"; @@ -17555,7 +17552,8 @@ in { # Tests cannot load the module to test doCheck = false; - propagatedBuildInputs = with self; [ ruamel_base typing ]; + propagatedBuildInputs = with self; [ ruamel_base typing ] ++ + (optional (!isPy3k) self.ruamel_ordereddict); meta = { description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";