From 61ddf369edf12e08d1d0a2a6b46c8a28c4353d38 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 16:29:54 +0100 Subject: [PATCH 1/7] python310Packages.xml2rfc: add changelog to meta --- pkgs/development/python-modules/xml2rfc/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 5a9b839c3b57..9406183651b1 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -27,6 +27,7 @@ buildPythonPackage rec { pname = "xml2rfc"; version = "3.15.3"; + 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-kA6Ali5zFEwe4iGpSSabUfNoaqY9/dxLyG+SccA94zc="; }; postPatch = '' @@ -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; From b6b24d2787176e653e120882a35e32d6136c2449 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 16:41:01 +0100 Subject: [PATCH 2/7] python311Packages.kitchen: update meta - add pythonImportsCheck --- .../python-modules/kitchen/default.nix | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/kitchen/default.nix b/pkgs/development/python-modules/kitchen/default.nix index 0b6f41d2c199..e60650594855 100644 --- a/pkgs/development/python-modules/kitchen/default.nix +++ b/pkgs/development/python-modules/kitchen/default.nix @@ -1,16 +1,33 @@ -{ 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; [ ]; }; } From 2acca392a20123d0e89226b77d9d44bd0d9cdf09 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 16:43:40 +0100 Subject: [PATCH 3/7] python311Packages.xml2rfc: add missing input --- .../python-modules/xml2rfc/default.nix | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 9406183651b1..8eba965ec7d1 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -1,27 +1,27 @@ { lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, intervaltree -, pyflakes -, requests -, lxml -, google-i18n-address -, pycountry -, html5lib -, six -, kitchen -, pypdf2 -, dict2xml -, weasyprint -, pyyaml -, jinja2 -, configargparse , appdirs +, buildPythonPackage +, configargparse , decorator +, dict2xml +, fetchFromGitHub +, google-i18n-address +, html5lib +, intervaltree +, jinja2 +, lxml +, markupsafe , pycairo +, pycountry +, pyflakes +, pypdf2 , pytestCheckHook , python-fontconfig +, pythonOlder +, pyyaml +, requests +, six +, wcwidth }: buildPythonPackage rec { @@ -47,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 ]; checkInputs = [ From 2e3942ce2308b16cc18bc92b8c70511060b5ce23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 16:45:49 +0100 Subject: [PATCH 4/7] python311Packages.xml2rfc: 3.15.3 -> 3.16.0 Diff: https://github.com/ietf-tools/xml2rfc/compare/refs/tags/v3.15.3...v3.16.0 Changelog: https://github.com/ietf-tools/xml2rfc/blob/v3.16.0/CHANGELOG.md --- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 8eba965ec7d1..0e252dda69ae 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.15.3"; + version = "3.16.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - hash = "sha256-kA6Ali5zFEwe4iGpSSabUfNoaqY9/dxLyG+SccA94zc="; + hash = "sha256-H2m6WZTIu2xLIz3ysOZcicIibPj8mErrxYM2+F07aS0="; }; postPatch = '' From 9cef2ea597d6bf277c4e02a9a04ccc3b777ab26a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 17:10:01 +0100 Subject: [PATCH 5/7] python311Packages.paver: add missing input --- .../python-modules/paver/default.nix | 44 ++++++++++++++----- 1 file changed, 32 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/paver/default.nix b/pkgs/development/python-modules/paver/default.nix index 8721ef3dd601..d46d6eaa2934 100644 --- a/pkgs/development/python-modules/paver/default.nix +++ b/pkgs/development/python-modules/paver/default.nix @@ -1,33 +1,53 @@ { 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"; + homepage = "https://github.com/paver/paver"; + license = licenses.bsd3; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; }; - } From 92bb58819b76da9838909dfc499666e0368eca86 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 17:50:04 +0100 Subject: [PATCH 6/7] python311Packages.python_fedora: update meta --- .../python-modules/python_fedora/default.nix | 47 ++++++++++++++++--- 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python_fedora/default.nix index 6a5c6a304f14..7f4e6e2a4fd5 100644 --- a/pkgs/development/python-modules/python_fedora/default.nix +++ b/pkgs/development/python-modules/python_fedora/default.nix @@ -1,22 +1,55 @@ -{ 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; [ ]; }; } From 7a9fe3580927ba74d5b5a5b827e33ec8f4406414 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Jan 2023 18:36:48 +0100 Subject: [PATCH 7/7] python311Packages.bunch: use fork --- .../python-modules/bunch/default.nix | 33 ++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/bunch/default.nix b/pkgs/development/python-modules/bunch/default.nix index 2758ff5b4185..39c858ebb676 100644 --- a/pkgs/development/python-modules/bunch/default.nix +++ b/pkgs/development/python-modules/bunch/default.nix @@ -1,17 +1,40 @@ -{ 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; [ ]; }; }