From 906eaf8cf77ed35b4000966f2530def997ee2874 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 10 Jul 2020 21:29:45 +0200 Subject: [PATCH] gnu: python-pygments: Update to 2.6.1. * gnu/packages/python-xyz.scm (python-pygments): Update to 2.6.1. [properties]: New field. (python2-pygments): Stay on version 2.5.2. --- gnu/packages/python-xyz.scm | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5f52776bda..cd5df12b9a 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -3338,14 +3338,14 @@ (define-public python-doc8 (define-public python-pygments (package (name "python-pygments") - (version "2.5.2") + (version "2.6.1") (source (origin (method url-fetch) (uri (pypi-uri "Pygments" version)) (sha256 (base32 - "1zmhnswy0wxfn0xprs9aqsvx2c3kmzfn2wx14q8cv3vpkxdamj4q")))) + "0i4gnd4q0mgkq0dp5wymn7ca8zjd8fgp63139svs6jf2c6h48wv4")))) (build-system python-build-system) (arguments ;; FIXME: Tests require sphinx, which depends on this. @@ -3354,10 +3354,21 @@ (define-public python-pygments (synopsis "Syntax highlighting") (description "Pygments is a syntax highlighting package written in Python.") - (license license:bsd-2))) + (license license:bsd-2) + (properties `((python2-variant . ,(delay python2-pygments)))))) +;; Pygments 2.6 and later does not support Python 2. (define-public python2-pygments - (package-with-python2 python-pygments)) + (let ((base (package-with-python2 (strip-python2-variant python-pygments)))) + (package + (inherit base) + (version "2.5.2") + (source (origin + (method url-fetch) + (uri (pypi-uri "Pygments" version)) + (sha256 + (base32 + "1zmhnswy0wxfn0xprs9aqsvx2c3kmzfn2wx14q8cv3vpkxdamj4q"))))))) (define-public python-bumpversion (package