[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/14: gnu: Remove duplicate python-google-brotli package.
From: |
guix-commits |
Subject: |
07/14: gnu: Remove duplicate python-google-brotli package. |
Date: |
Tue, 12 Oct 2021 20:56:50 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit c181e83fba89e0fd643c67d84dacb35a91d643aa
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Tue Oct 12 14:46:42 2021 +0200
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.
---
gnu/packages/compression.scm | 6 ++++--
gnu/packages/django.scm | 1 -
gnu/packages/fonts.scm | 2 +-
gnu/packages/gnome.scm | 1 -
gnu/packages/python-compression.scm | 20 --------------------
gnu/packages/python-web.scm | 1 -
6 files changed, 5 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index aea56a7..3098230 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -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
diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm
index f8aae1e..3d1c9d1 100644
--- a/gnu/packages/django.scm
+++ b/gnu/packages/django.scm
@@ -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)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index c9a9e4f..5cf2393 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -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)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index af4b953..a60404d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -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)
diff --git a/gnu/packages/python-compression.scm
b/gnu/packages/python-compression.scm
index 30062f4..81e1630 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -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")
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index b99e358..dcb84d0 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -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)
- branch master updated (f0c0ef6 -> 4605d4d), guix-commits, 2021/10/12
- 02/14: gnu: Add ntfsfix-static., guix-commits, 2021/10/12
- 06/14: gnu: Rename google-brotli back to brotli., guix-commits, 2021/10/12
- 08/14: gnu: fheroes2: Update to 0.9.8., guix-commits, 2021/10/12
- 09/14: gnu: acpid: Update to 2.0.33., guix-commits, 2021/10/12
- 03/14: linux-initrd: Support checking NTFS volumes on boot., guix-commits, 2021/10/12
- 01/14: gnu: Add ntfs-3g-static., guix-commits, 2021/10/12
- 04/14: gnu: cpufrequtils: Update to 008., guix-commits, 2021/10/12
- 05/14: gnu: Remove sysfsutils@1., guix-commits, 2021/10/12
- 07/14: gnu: Remove duplicate python-google-brotli package.,
guix-commits <=
- 11/14: gnu: astroid: Update to 0.16., guix-commits, 2021/10/12
- 13/14: gnu: apostrophe: Update to 2.5., guix-commits, 2021/10/12
- 10/14: gnu: btrfs-progs: Update to 5.14.2., guix-commits, 2021/10/12
- 12/14: gnu: aqbanking: Update to 6.3.2., guix-commits, 2021/10/12
- 14/14: gnu: gsound: Update to 1.0.3., guix-commits, 2021/10/12