From ca8a59801edd1e46035a8ad0692ad43010b4b674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 30 Aug 2021 00:52:38 +0200 Subject: [PATCH] python39Packages.zconfig: 3.5.0 -> 3.6.0 --- .../python-modules/zconfig/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index a6a00ad821b8..521bca4ece8c 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -1,32 +1,27 @@ -{ lib, stdenv +{ lib +, stdenv , fetchPypi -, fetchpatch , buildPythonPackage , zope_testrunner , manuel , docutils -, pythonAtLeast +, pygments }: buildPythonPackage rec { pname = "ZConfig"; - version = "3.5.0"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0s7aycxna07a04b4rswbkj4y5qh3gxy2mcsqb9dmy0iimj9f9550"; + sha256 = "sha256-oo6VoK4zV5V0fsytNbLLcI831Ex/Ml4qyyAemDMLFuU="; }; - patches = [ - # fixes 3.8+ logger validation issues, has been merged into master, remove next bump - (fetchpatch { - url = "https://github.com/zopefoundation/ZConfig/commit/f0c2990d35ac3c924ecc8be4a5c71c8e4abbd0e5.patch"; - sha256 = "1bjg3wrvii0rwzf3s0vlpzgg2ckj0h2zxkyxwjcr64s4k2vaq9ij"; - }) - ] ++ lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; + patches = lib.optional stdenv.hostPlatform.isMusl ./remove-setlocale-test.patch; buildInputs = [ manuel docutils ]; propagatedBuildInputs = [ zope_testrunner ]; + checkInputs = [ pygments ]; meta = with lib; { description = "Structured Configuration Library";