guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

14/15: gnu: python-pygments: Absorb grafted replacement.


From: guix-commits
Subject: 14/15: gnu: python-pygments: Absorb grafted replacement.
Date: Mon, 17 May 2021 15:09:58 -0400 (EDT)

lfam pushed a commit to branch wip-ungrafting
in repository guix.

commit c12325ee4878c22bb157d7c6383232f3703f0671
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 | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f79fc54..08b1e72 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3959,15 +3959,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.
@@ -3979,17 +3978,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))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]