ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-21 12:38:41 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #143640 from Mic92/ruamel-yaml-clib

Browse Source
This commit is contained in:
Sandro 2021-11-01 17:31:40 +01:00 committed by GitHub
commit b8314a3346
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/python-modules/ruamel_yaml/0.16.nix
View File

@ -2,9 +2,9 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, ruamel_base , ruamel_base
, ruamel_ordereddict ? null , ruamel_ordereddict
, ruamel_yaml_clib ? null , ruamel_yaml_clib ? null
, isPy3k , isPy27
, isPyPy , isPyPy
}: }:
@ -21,11 +21,11 @@ buildPythonPackage rec {
doCheck = false; doCheck = false;
propagatedBuildInputs = [ ruamel_base ] propagatedBuildInputs = [ ruamel_base ]
++ lib.optional (!isPy3k) ruamel_ordereddict ++ lib.optional isPy27 ruamel_ordereddict
++ lib.optional (!isPyPy) ruamel_yaml_clib; ++ lib.optional (!isPyPy) ruamel_yaml_clib;
# causes namespace clash on py27 # causes namespace clash on py27
dontUsePythonImportsCheck = !isPy3k; dontUsePythonImportsCheck = isPy27;
pythonImportsCheck = [ pythonImportsCheck = [
"ruamel.yaml" "ruamel.yaml"
"ruamel.base" "ruamel.base"
@ -35,6 +35,6 @@ buildPythonPackage rec {
description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
homepage = "https://sourceforge.net/projects/ruamel-yaml/"; homepage = "https://sourceforge.net/projects/ruamel-yaml/";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
}; };
} }

9
pkgs/development/python-modules/ruamel_yaml/default.nix
View File

@ -2,9 +2,7 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, ruamel_base , ruamel_base
, ruamel_ordereddict ? null , ruamel_yaml_clib
, ruamel_yaml_clib ? null
, isPy3k
, isPyPy , isPyPy
}: }:
@ -21,11 +19,8 @@ buildPythonPackage rec {
doCheck = false; doCheck = false;
propagatedBuildInputs = [ ruamel_base ] propagatedBuildInputs = [ ruamel_base ]
++ lib.optional (!isPy3k) ruamel_ordereddict
++ lib.optional (!isPyPy) ruamel_yaml_clib; ++ lib.optional (!isPyPy) ruamel_yaml_clib;
# causes namespace clash on py27
dontUsePythonImportsCheck = !isPy3k;
pythonImportsCheck = [ pythonImportsCheck = [
"ruamel.yaml" "ruamel.yaml"
"ruamel.base" "ruamel.base"
@ -35,6 +30,6 @@ buildPythonPackage rec {
description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
homepage = "https://sourceforge.net/projects/ruamel-yaml/"; homepage = "https://sourceforge.net/projects/ruamel-yaml/";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
}; };
} }

14
pkgs/development/python-modules/ruamel_yaml_clib/default.nix
View File

@ -1,28 +1,28 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchhg , fetchhg
, ruamel_base
, ruamel_ordereddict ? null
, isPy3k
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "ruamel.yaml.clib"; pname = "ruamel.yaml.clib";
version = "0.2.0"; version = "0.2.4";
src = fetchhg { src = fetchhg {
url = "http://hg.code.sf.net/p/ruamel-yaml-clib/code"; url = "http://hg.code.sf.net/p/ruamel-yaml-clib/code";
rev = version; rev = version;
sha256 = "0kq6zi96qlm72lzj90fc2rfk6nm5kqhk6qxdl8wl9s3a42b0v6wl"; sha256 = "sha256-HQZY1opUvVQdXUHmsZmcYX2vfgjKsl6xATmVIXjnBlc=";
}; };
# outputs match wheel # no tests
doCheck = false; doCheck = false;
# circular depedency with ruamel-yaml
# pythonImportsCheck = [ "_ruamel_yaml" ];
meta = with lib; { meta = with lib; {
description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order"; description = "YAML parser/emitter that supports roundtrip preservation of comments, seq/map flow style, and map key order";
homepage = "https://sourceforge.net/projects/ruamel-yaml-clib/"; homepage = "https://sourceforge.net/projects/ruamel-yaml-clib/";
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
}; };
} }