diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-10-12 14:35:17 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-10-13 01:20:19 +0200 |
| commit | 28b5ef11595f9dbc6fcc103d3f34e5b0d73334c9 (patch) | |
| tree | fe1b9ce5fdda2230610ad9e815da3e2b65cc733d /gnu/packages/node.scm | |
| parent | faa83a040a3008782091638133e7bfaaae539857 (diff) | |
| download | guix-patches-28b5ef11595f9dbc6fcc103d3f34e5b0d73334c9.tar guix-patches-28b5ef11595f9dbc6fcc103d3f34e5b0d73334c9.tar.gz | |
gnu: Rename google-brotli back to brotli.
Sorry for the noise, but good riddance. Our nonstandard name for this
package has caused confusion since it was added. For example, the
duplicate python-brotli and python-google-brotli packages added later,
with the latter name making even less sense.
The Python packages will be fixed in the next commit.
* gnu/packages/compression.scm (google-brotli): Redefine as a
deprecated-package, with…
(brotli): …restored to canonical status.
(python-google-brotli)[inherit]: Adjust accordingly.
* gnu/packages/databases.scm (apache-arrow)[inputs]: Adjust accordingly.
* gnu/packages/fontutils.scm (woff2)[inputs]: Likewise.
* gnu/packages/gnome.scm (libsoup)[propagated-inputs]: Likewise.
* gnu/packages/networking (wireshark)[inputs]: Likewise.
* gnu/packages/node.scm (node-lts)[arguments, native-inputs]: Likewise.
* gnu/packages/python-xyz.scm (python-imagecodecs)[inputs]: Likewise.
Diffstat (limited to 'gnu/packages/node.scm')
| -rw-r--r-- | gnu/packages/node.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm index f8ac95884c..d0ffe8a398 100644 --- a/gnu/packages/node.scm +++ b/gnu/packages/node.scm @@ -685,7 +685,7 @@ source files.") (lambda* (#:key native-inputs inputs #:allow-other-keys) (let* ((inputs (or native-inputs inputs)) (c-ares (assoc-ref inputs "c-ares")) - (google-brotli (assoc-ref inputs "google-brotli")) + (brotli (assoc-ref inputs "brotli")) (icu4c (assoc-ref inputs "icu4c")) (nghttp2 (assoc-ref inputs "nghttp2")) (openssl (assoc-ref inputs "openssl")) @@ -704,7 +704,7 @@ source files.") (string-append target "'ldflags': ['-Wl,-rpath=" c-ares "/lib:" - google-brotli "/lib:" + brotli "/lib:" icu4c "/lib:" nghttp2 "/lib:" openssl "/lib:" @@ -821,7 +821,7 @@ source files.") (native-inputs `(;; Runtime dependencies for binaries used as a bootstrap. ("c-ares" ,c-ares) - ("google-brotli" ,google-brotli) + ("brotli" ,brotli) ("icu4c" ,icu4c-67) ("libuv" ,libuv-for-node) ("nghttp2" ,nghttp2 "lib") @@ -840,7 +840,7 @@ source files.") ("icu4c" ,icu4c-67) ("libuv" ,libuv-for-node) ("llhttp" ,llhttp-bootstrap) - ("google-brotli" ,google-brotli) + ("brotli" ,brotli) ("nghttp2" ,nghttp2 "lib") ("openssl" ,openssl) ("zlib" ,zlib))))) |