gnu: python-pillow: Ungraft.

* gnu/packages/python-xyz.scm (python-pillow): Ungraft, preserving...
[source]: ... the CVE patch.
(python-pillow/security-fixes): Delete variable.
This commit is contained in:
Maxim Cournoyer 2023-04-15 00:02:06 -04:00
parent 52518b6478
commit ab2f4548a6
No known key found for this signature in database
GPG key ID: 1260E46482E63562

View file

@ -7826,7 +7826,6 @@ (define-public python-pillow
(package (package
(name "python-pillow") (name "python-pillow")
(version "9.2.0") (version "9.2.0")
(replacement python-pillow/security-fixes)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "Pillow" version)) (uri (pypi-uri "Pillow" version))
@ -7835,7 +7834,9 @@ (define-public python-pillow
"011wgm1mssjchpva9wsi2a07im9czyjvik137xlp5f0g7vykdrkm")) "011wgm1mssjchpva9wsi2a07im9czyjvik137xlp5f0g7vykdrkm"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet '(begin (snippet '(begin
(delete-file-recursively "src/thirdparty"))))) (delete-file-recursively "src/thirdparty")))
(patches
(search-patches "python-pillow-CVE-2022-45199.patch"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (list python-pytest)) (native-inputs (list python-pytest))
(inputs (list freetype (inputs (list freetype
@ -7874,10 +7875,6 @@ (define-public python-pillow
"http://www.pythonware.com/products/pil/license.htm" "http://www.pythonware.com/products/pil/license.htm"
"The PIL Software License")))) "The PIL Software License"))))
(define-public python-pillow/security-fixes
(package-with-patches python-pillow
(search-patches "python-pillow-CVE-2022-45199.patch")))
(define-public python-pillow-2.9 (define-public python-pillow-2.9
(package (package
(inherit python-pillow) (inherit python-pillow)