Merge pull request #211952 from fabaff/xml2rfc-fix (d3eee318) · Commits · nix / nixpkgs

pkgs/development/python-modules/bunch/default.nix

+28 −5

Original line number	Diff line number	Diff line
		{ lib, buildPythonPackage, fetchPypi }:
		{ lib
		, buildPythonPackage
		, fetchFromGitHub
		, pythonOlder
		}:

		buildPythonPackage rec {
		pname = "bunch";
		version = "1.0.1";
		version = "unstable-2017-11-21";
		format = "setuptools";

		src = fetchPypi {
		inherit pname version;
		sha256 = "1akalx2pd1fjlvrq69plvcx783ppslvikqdm93z2sdybq07pmish";
		disabled = pythonOlder "3.7";

		# Use a fork as upstream is dead
		src = fetchFromGitHub {
		owner = "olivecoder";
		repo = pname;
		rev = "71ac9d5c712becd4c502ab3099203731a0f1122e";
		hash = "sha256-XOgzJkcIqkAJFsKAyt2jSEIxcc0h2gFC15xy5kAs+7s=";
		};

		postPatch = ''
		substituteInPlace setup.py \
		--replace "rU" "r"
		'';

		# No real tests available
		doCheck = false;

		pythonImportsCheck = [
		"bunch"
		];

		meta = with lib; {
		description = "Python dictionary that provides attribute-style access";
		homepage = "https://github.com/dsc/bunch";
		license = licenses.mit;
		maintainers = with maintainers; [ ];
		};
		}

pkgs/development/python-modules/kitchen/default.nix

+20 −3

Original line number	Diff line number	Diff line
		{ lib, buildPythonPackage, fetchPypi }:
		{ lib
		, buildPythonPackage
		, fetchPypi
		, pythonOlder
		}:

		buildPythonPackage rec {
		pname = "kitchen";
		version = "1.2.6";
		format = "setuptools";

		disabled = pythonOlder "3.7";

		src = fetchPypi {
		inherit pname version;
		sha256 = "0g5hq2icnng9vy4www5hnr3r5srisfwp0wxw1sv5c5dxy61gak5q";
		hash = "sha256-uEz1gvG9FVa2DrxzcLnTMeuSR7awcM6J3+lZy6LAsDw=";
		};

		# Waiting for upstream's clean-up
		doCheck = false;

		pythonImportsCheck = [
		"kitchen"
		];

		meta = with lib; {
		description = "Kitchen contains a cornucopia of useful code";
		license = licenses.lgpl2;
		homepage = "https://github.com/fedora-infra/kitchen";
		changelog = "https://github.com/fedora-infra/kitchen/blob/${version}/NEWS.rst";
		license = licenses.lgpl2Only;
		maintainers = with maintainers; [ ];
		};
		}

pkgs/development/python-modules/paver/default.nix

+32 −12

Original line number	Diff line number	Diff line
		{ lib
		, buildPythonPackage
		, fetchPypi
		, nose
		, cogapp
		, fetchPypi
		, mock
		, nose
		, pytestCheckHook
		, pythonOlder
		, six
		, virtualenv
		}:

		buildPythonPackage rec {
		pname = "paver";
		version = "1.3.4";
		pname = "Paver";
		format = "setuptools";

		disabled = pythonOlder "3.7";

		src = fetchPypi {
		inherit pname version;
		sha256 = "d3e6498881485ab750efe40c5278982a9343bc627e137b11adced627719308c7";
		pname = "Paver";
		inherit version;
		hash = "sha256-0+ZJiIFIWrdQ7+QMUniYKpNDvGJ+E3sRrc7WJ3GTCMc=";
		};

		buildInputs = [ cogapp mock virtualenv ];
		propagatedBuildInputs = [
		six
		];

		propagatedBuildInputs = [ nose ];
		checkInputs = [
		cogapp
		mock
		nose
		pytestCheckHook
		virtualenv
		];

		# the tests do not pass
		doCheck = false;
		pythonImportsCheck = [
		"paver"
		];

		disabledTestPaths = [
		# Test depends on distutils
		"paver/tests/test_setuputils.py"
		];

		meta = with lib; {
		description = "A Python-based build/distribution/deployment scripting tool";
		homepage = "https://github.com/paver/paver";
		license = licenses.bsd3;
		maintainers = with maintainers; [ lovek323 ];
		platforms = platforms.unix;
		};

		}

pkgs/development/python-modules/python_fedora/default.nix

+40 −7

Original line number	Diff line number	Diff line
		{ lib, buildPythonPackage, fetchPypi, kitchen, requests, bunch, paver
		, six, munch, urllib3, beautifulsoup4, openidc-client, lockfile }:
		{ lib
		, beautifulsoup4
		, buildPythonPackage
		, bunch
		, fetchPypi
		, kitchen
		, lockfile
		, munch
		, openidc-client
		, paver
		, pythonOlder
		, requests
		, six
		, urllib3
		}:

		buildPythonPackage rec {
		pname = "python-fedora";
		version = "1.1.1";
		format = "setuptools";

		disabled = pythonOlder "3.7";

		src = fetchPypi {
		inherit pname version;
		sha256 = "56b9d841a39b4030e388e90c7b77dacd479f1ce5e2ff9b18c3954d97d5709a19";
		hash = "sha256-VrnYQaObQDDjiOkMe3fazUefHOXi/5sYw5VNl9Vwmhk=";
		};
		propagatedBuildInputs = [ kitchen requests bunch paver lockfile
		six munch urllib3 beautifulsoup4 openidc-client ];

		propagatedBuildInputs = [
		beautifulsoup4
		bunch
		kitchen
		lockfile
		munch
		openidc-client
		paver
		requests
		six
		urllib3
		];

		doCheck = false;

		pythonImportsCheck = [
		"fedora"
		];

		meta = with lib; {
		description = "Python Fedora Module";
		description = "Module to interact with the infrastructure of the Fedora Project";
		homepage = "https://github.com/fedora-infra/python-fedora";
		license = licenses.lgpl2;
		changelog = "https://github.com/fedora-infra/python-fedora/releases/tag/1.1.1";
		license = licenses.lgpl21Plus;
		maintainers = with maintainers; [ ];
		};
		}

pkgs/development/python-modules/xml2rfc/default.nix

+33 −29

Original line number	Diff line number	Diff line
		{ lib
		, appdirs
		, buildPythonPackage
		, configargparse
		, decorator
		, dict2xml
		, fetchFromGitHub
		, pythonOlder
		, intervaltree
		, pyflakes
		, requests
		, lxml
		, google-i18n-address
		, pycountry
		, html5lib
		, six
		, kitchen
		, pypdf2
		, dict2xml
		, weasyprint
		, pyyaml
		, intervaltree
		, jinja2
		, configargparse
		, appdirs
		, decorator
		, lxml
		, markupsafe
		, pycairo
		, pycountry
		, pyflakes
		, pypdf2
		, pytestCheckHook
		, python-fontconfig
		, pythonOlder
		, pyyaml
		, requests
		, six
		, wcwidth
		}:

		buildPythonPackage rec {
		pname = "xml2rfc";
		version = "3.15.3";
		version = "3.16.0";
		format = "setuptools";

		disabled = pythonOlder "3.6";

		@@ -34,7 +35,7 @@ buildPythonPackage rec {
		owner = "ietf-tools";
		repo = "xml2rfc";
		rev = "refs/tags/v${version}";
		sha256 = "sha256-kA6Ali5zFEwe4iGpSSabUfNoaqY9/dxLyG+SccA94zc=";
		hash = "sha256-H2m6WZTIu2xLIz3ysOZcicIibPj8mErrxYM2+F07aS0=";
		};

		postPatch = ''
		@@ -46,22 +47,22 @@ buildPythonPackage rec {
		'';

		propagatedBuildInputs = [
		appdirs
		configargparse
		dict2xml
		google-i18n-address
		html5lib
		intervaltree
		jinja2
		lxml
		markupsafe
		pycountry
		pyflakes
		pypdf2
		pyyaml
		requests
		lxml
		google-i18n-address
		pycountry
		html5lib
		six
		kitchen
		pypdf2
		dict2xml
		weasyprint
		configargparse
		appdirs
		wcwidth
		];

		nativeCheckInputs = [
		@@ -71,18 +72,21 @@ buildPythonPackage rec {
		python-fontconfig
		];

		# requires Noto Serif and Roboto Mono font
		# Requires Noto Serif and Roboto Mono font
		doCheck = false;

		checkPhase = ''
		make tests-no-network
		'';

		pythonImportsCheck = [ "xml2rfc" ];
		pythonImportsCheck = [
		"xml2rfc"
		];

		meta = with lib; {
		description = "Tool generating IETF RFCs and drafts from XML sources";
		homepage = "https://github.com/ietf-tools/xml2rfc";
		changelog = "https://github.com/ietf-tools/xml2rfc/blob/v${version}/CHANGELOG.md";
		# Well, parts might be considered unfree, if being strict; see:
		# http://metadata.ftp-master.debian.org/changelogs/non-free/x/xml2rfc/xml2rfc_2.9.6-1_copyright
		license = licenses.bsd3;

Admin message