From 30347106e5e2c18e40fec05c58dde7350b5f20be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Sep 2022 20:55:11 +0000 Subject: [PATCH 1/2] python310Packages.xml2rfc: 3.14.2 -> 3.15.0 --- 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 d7d5b52ee42e..d0f832dd7437 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.14.2"; + version = "3.15.0"; disabled = pythonOlder "3.6"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "ietf-tools"; repo = "xml2rfc"; rev = "refs/tags/v${version}"; - sha256 = "sha256-7UKav9IOH3u/3ZPDWVTBSf+A1li65qK2qASJpNVezdI="; + sha256 = "sha256-sCpV4pmBIBFxFpDK7H9riQ+0174xCn6uVztGDAEeoII="; }; postPatch = '' From 45b374ba080536d2697e507670e0e7723d833417 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 23 Sep 2022 10:24:19 +0200 Subject: [PATCH 2/2] python310Packages.xml2rfc: Remove unneeded patches --- pkgs/development/python-modules/xml2rfc/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index d0f832dd7437..d7cd08ad22b1 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -40,13 +40,9 @@ buildPythonPackage rec { postPatch = '' substituteInPlace Makefile \ --replace "SHELL := /bin/bash" "SHELL := bash" \ - --replace "test flaketest" "test" \ - --replace "python setup.py --quiet install" "" + --replace "test flaketest" "test" substituteInPlace setup.py \ --replace "'tox'," "" - substituteInPlace requirements.txt \ - --replace "jinja2>=2.11,<3.0" "jinja2" \ - --replace "markupsafe==2.0.1" "markupsafe" ''; propagatedBuildInputs = [