[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
12/18: gnu: python-pygments: Absorb grafted replacement.
From: |
guix-commits |
Subject: |
12/18: gnu: python-pygments: Absorb grafted replacement. |
Date: |
Sun, 6 Jun 2021 15:26:57 -0400 (EDT) |
lfam pushed a commit to branch wip-ungrafting
in repository guix.
commit efa0aac97ab0859a0fadee522e84b49eeca23813
Author: Leo Famulari <leo@famulari.name>
AuthorDate: Mon May 17 11:55:53 2021 -0400
gnu: python-pygments: Absorb grafted replacement.
* gnu/packages/python-xyz.scm (python-pygments): Update to 2.7.4.
[replacement]: Remove field.
(python-pygments/fixed): Remove variable.
---
gnu/packages/python-xyz.scm | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 6a6d7f4..b9ba99f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -4018,15 +4018,14 @@ text styles of documentation.")
(define-public python-pygments
(package
(name "python-pygments")
- (version "2.7.3")
+ (version "2.7.4")
(source
(origin
(method url-fetch)
(uri (pypi-uri "Pygments" version))
(sha256
(base32
- "05mps9r966r3dpqw6zrs1nlwjdf5y4960hl9m7abwb3qyfnarwyc"))))
- (replacement python-pygments/fixed)
+ "0dy35ry5qa8dpklk4fkj9kfpw2qb4mh5ha9866kw30wf96dx0jfz"))))
(build-system python-build-system)
(arguments
;; FIXME: Tests require sphinx, which depends on this.
@@ -4038,18 +4037,6 @@ text styles of documentation.")
(license license:bsd-2)
(properties `((python2-variant . ,(delay python2-pygments))))))
-(define python-pygments/fixed
- (package
- (inherit python-pygments)
- (version "2.7.4")
- (source
- (origin
- (method url-fetch)
- (uri (pypi-uri "Pygments" version))
- (sha256
- (base32
- "0dy35ry5qa8dpklk4fkj9kfpw2qb4mh5ha9866kw30wf96dx0jfz"))))))
-
;; Pygments 2.6 and later does not support Python 2.
(define-public python2-pygments
(let ((base (package-with-python2 (strip-python2-variant python-pygments))))
- branch wip-ungrafting created (now 1406e2c), guix-commits, 2021/06/06
- 01/18: gnu: postgresql: Absorb grafted replacement., guix-commits, 2021/06/06
- 03/18: gnu: zstd: Absorb grafted replacement., guix-commits, 2021/06/06
- 02/18: gnu: OpenLDAP: Absorb grafted replacement., guix-commits, 2021/06/06
- 05/18: gnu: glib: Absorb grafted replacement., guix-commits, 2021/06/06
- 06/18: gnu: libtiff: Absorb grafted replacement., guix-commits, 2021/06/06
- 07/18: gnu: c-ares: Absorb grafted replacement., guix-commits, 2021/06/06
- 08/18: gnu: unzip: Absorb grafted replacement., guix-commits, 2021/06/06
- 12/18: gnu: python-pygments: Absorb grafted replacement.,
guix-commits <=
- 13/18: gnu: SQLite: Absorb grafted replacement., guix-commits, 2021/06/06
- 04/18: gnu: zziplib: Absorb grafted replacement., guix-commits, 2021/06/06
- 11/18: gnu: python-urllib3: Absorb grafted replacement., guix-commits, 2021/06/06
- 09/18: gnu: MariaDB: Absorb grafted replacement., guix-commits, 2021/06/06
- 17/18: gnu: libx11: Absorb grafted replacement., guix-commits, 2021/06/06
- 10/18: gnu: Graphviz: Absorb grafted replacement., guix-commits, 2021/06/06
- 14/18: gnu: curl: Absorb grafted replacement., guix-commits, 2021/06/06
- 15/18: gnu: OpenSSL: Absorb grafted replacement., guix-commits, 2021/06/06
- 16/18: gnu: expat: Absorb grafted replacement., guix-commits, 2021/06/06
- 18/18: gnu: GnuTLS: Absorb grafted replacement., guix-commits, 2021/06/06