me
/
guix
Archived
1
0
Fork 0

gnu: Remove duplicate python-google-brotli package.

* gnu/packages/python-compression.scm (python-brotli):
Delete duplicate variable.
* gnu/packages/compression.scm (python-google-brotli):
Redefine as a deprecated-package, with…
(python-brotli): …as the canonical variable.
* gnu/packages/fonts.scm (font-meera-inimai)[native-inputs]:
Adjust accordingly.
master
Tobias Geerinckx-Rice 2021-10-12 14:46:42 +02:00
parent 28b5ef1159
commit c181e83fba
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
6 changed files with 5 additions and 26 deletions

View File

@ -2225,16 +2225,18 @@ The specification of the Brotli Compressed Data Format is defined in RFC 7932.")
(define-public google-brotli
(deprecated-package "google-brotli" brotli))
(define-public python-google-brotli
(define-public python-brotli
(package
(inherit brotli)
(name "python-google-brotli")
(name "python-brotli")
(build-system python-build-system)
(arguments '())
(synopsis "Python interface to Brotli")
(description "This package provides a Python interface to the @code{brotli}
package, an implementation of the Brotli lossless compression algorithm.")))
(define-public python-google-brotli
(deprecated-package "python-google-brotli" python-brotli))
(define-public ucl
(package

View File

@ -37,7 +37,6 @@
#:use-module (gnu packages geo)
#:use-module (gnu packages openldap)
#:use-module (gnu packages python)
#:use-module (gnu packages python-compression)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)

View File

@ -2050,7 +2050,7 @@ It comes in seven weights and Roman, Italic and Oblique styles.")
("harfbuzz" ,harfbuzz "bin")
("python" ,python-minimal)
("python-fonttools" ,python-fonttools)
("python-google-brotli" ,python-google-brotli)))
("python-brotli" ,python-brotli)))
(arguments
`(#:make-flags (list "PY=python3"
(string-append "DESTDIR=" %output)

View File

@ -170,7 +170,6 @@
#:use-module (gnu packages protobuf)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
#:use-module (gnu packages python-compression)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)

View File

@ -261,26 +261,6 @@ the LZ4 frame format.")
(define-public python2-lzstring
(package-with-python2 python-lzstring))
(define-public python-brotli
(package
(name "python-brotli")
(version "1.0.9")
(source
(origin
(method url-fetch)
(uri (pypi-uri "Brotli" version ".zip"))
(sha256
(base32
"0f4433s4wv9masc303kkb1s0a09x81xwr8pdvj0kyxzdl05826sd"))))
(build-system python-build-system)
(native-inputs
`(("unzip" ,unzip)))
(home-page "https://github.com/google/brotli")
(synopsis "Python bindings for the Brotli compression library")
(description
"This package provides python bindings for the Brotli compression library.")
(license license:asl2.0)))
(define-public bitshuffle
(package
(name "bitshuffle")

View File

@ -81,7 +81,6 @@
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-check)
#:use-module (gnu packages python-compression)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-science)
#:use-module (gnu packages python-xyz)