guix_mirror_bot pushed a commit to branch ungrafting
in repository guix.

commit 567efcafb3931cefe794f9e92a3ce6870534873b
Author: Jelle Licht <[email protected]>
AuthorDate: Sun Nov 15 13:44:16 2026 +0100

    gnu: brotli: Ungraft.
    
    * gnu/packages/compression.scm (brotli)[source]: Add patch.
    [replacement]: Remove field.
    (brotli/fixed): Delete variable.
    * gnu/packages/node.scm (node-lts)[native-inputs, inputs]: Replace
    brotli/fixed with brotli.
---
 gnu/packages/compression.scm | 16 ++--------------
 gnu/packages/node.scm        |  4 ++--
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index a6026ca7c98..491464998ff 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -2598,7 +2598,6 @@ targeting storage applications.  ISA-L includes:
   (package
     (name "brotli")
     (version "1.2.0")
-    (replacement brotli/fixed)
     (source
      (origin
        (method git-fetch)
@@ -2607,7 +2606,8 @@ targeting storage applications.  ISA-L includes:
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0vv7r7m7m6hqhbwb017s4rvc378mjxxvigg37r76imsqlyafbxvq"))))
+        (base32 "0vv7r7m7m6hqhbwb017s4rvc378mjxxvigg37r76imsqlyafbxvq"))
+       (patches (search-patches "brotli-CVE-2026-111497.patch"))))
     (build-system cmake-build-system)
     (home-page "https://github.com/google/brotli";)
     (synopsis "General-purpose lossless compression")
@@ -2621,18 +2621,6 @@ with @code{deflate} but offers more dense compression.
 The specification of the Brotli Compressed Data Format is defined in RFC 
7932.")
     (license license:expat)))
 
-(define-public brotli/fixed
-  (hidden-package
-   (package
-     (inherit brotli)
-     (source
-      (let ((s (package-source brotli)))
-        (origin
-          (inherit s)
-          (patches
-           (append (search-patches "brotli-CVE-2026-111497.patch")
-                   (origin-patches s)))))))))
-
 (define-public java-brotli
   (package
     (inherit brotli)
diff --git a/gnu/packages/node.scm b/gnu/packages/node.scm
index ef7c6e5d740..004fc1ae117 100644
--- a/gnu/packages/node.scm
+++ b/gnu/packages/node.scm
@@ -633,7 +633,7 @@ parser definition into a C output.")
     (native-inputs
      (list
       ;; Runtime dependencies for binaries used as a bootstrap.
-      brotli/fixed
+      brotli
       c-ares-for-node-lts
       cpp-ada-url-parser
       googletest
@@ -661,7 +661,7 @@ parser definition into a C output.")
       util-linux))
     (inputs
      (list bash-minimal
-           brotli/fixed
+           brotli
            c-ares-for-node-lts
            coreutils-minimal
            cpp-ada-url-parser

Reply via email to