Received: (at submit) by debbugs.gnu.org; 30 Dec 2024 09:37:10 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Mon Dec 30 04:37:10 2024
Received: from localhost ([127.0.0.1]:57363 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tSCCz-0006jU-GI
for submit <at> debbugs.gnu.org; Mon, 30 Dec 2024 04:37:10 -0500
Received: from lists.gnu.org ([209.51.188.17]:51438)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <d.khodabakhsh@HIDDEN>) id 1tSCCx-0006jM-4S
for submit <at> debbugs.gnu.org; Mon, 30 Dec 2024 04:37:08 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <d.khodabakhsh@HIDDEN>)
id 1tSCCw-0001gD-V4
for guix-patches@HIDDEN; Mon, 30 Dec 2024 04:37:06 -0500
Received: from mail-ua1-x92e.google.com ([2607:f8b0:4864:20::92e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <d.khodabakhsh@HIDDEN>)
id 1tSCCu-0002ES-JH
for guix-patches@HIDDEN; Mon, 30 Dec 2024 04:37:06 -0500
Received: by mail-ua1-x92e.google.com with SMTP id
a1e0cc1a2514c-85bc5d0509bso1568138241.1
for <guix-patches@HIDDEN>; Mon, 30 Dec 2024 01:37:03 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1735551423; x=1736156223; darn=gnu.org;
h=to:subject:message-id:date:from:mime-version:from:to:cc:subject
:date:message-id:reply-to;
bh=ezoLlDm9CIFVhZNf2uAkgfx1USMPSz2c5KFbeXjEaqQ=;
b=D8CmoWYK4jUP6TwpqcbSYJkTd5BFZT6ZKFXiX3k43jp8vStTEGOI5BbhEzfmA5Onnb
/XHauGt6m7bkw8NELiuz+OO8nHZU4efp5QVQzTxFZC3WEnyOoX/byQWqPBbW19J6ZEM+
Tmw3pNwaK/HlPgG1yhcIgzClqdJLyOt2ngTC7SYb8VKoRAiYtuuWUKWhEdOZ/AHb3BeC
hAZDPOvx+BqLgsFUqfxbWnmG/7sobc443BF6Wk/UJPOPMv/GRkn35lKw0/PKdO65oEB1
YMNYbaJk/Bm9Yso2h6hFsTSpBkSwfSwegrjhq5R8fKnkkOODm3KFjnUnmc0mEo97fLLU
/7JA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1735551423; x=1736156223;
h=to:subject:message-id:date:from:mime-version:x-gm-message-state
:from:to:cc:subject:date:message-id:reply-to;
bh=ezoLlDm9CIFVhZNf2uAkgfx1USMPSz2c5KFbeXjEaqQ=;
b=JolTzqIO+gBryfOugKcaNyHJYGSG5JdZkx4zJb8uRznVfdpRhxTdoh6UQN4PfYJdqX
gl0UhjOK/Z9LukXHNtP2og8X93YYDlrYJkJjXV7DXIU5LTyvBioRtg8FeExpYO61MYXe
qX5y7R7DJuEgy9iU5jUeKTRJYA4haXEvK16tOemItJjuGr6kHqvHfXzkdR3XV1sJoJVZ
ANIq8TTf1GQLESqtjBjBzW8YJksVByB6UHYvgmXe+ufLBnXscFg5I/tR+C/aVqZiz9D0
KWweIdA8x3QubPkAUkBSmNntfWQHU08Mnzg4+AxOpqEW+1YNuYu/0y13xBp70tN43glg
7ZoA==
X-Gm-Message-State: AOJu0Yyny3BZDOEBNJTkwyLNm2RFbaC6BwlBXGqZ0+VZtYLpz3zeP+LO
u3BxKKIzguzNkRdExDjHpJGj/sngHT+f5e/8BACly4Ed/XbNCq0rSIgp/iXHOOdd/Wx3z0LQFIw
wd12u/xU86CxuJHbLdxfVCUbmAac1Ff5U
X-Gm-Gg: ASbGncsaVfvn3vZhuvMJb/7Tv9RFFSjsD2JT9HCg07LioxS39QckYodFCSdAkYvfw2Z
+fqQkdjpBAelGPRz5GLsFakPlSnBVE8wCOmIhRYIK
X-Google-Smtp-Source: AGHT+IFYedbEU2ymc+4RwmF7uMCFF9TYbrz1wUXCtM+2ATL+DhIRzyS5mw5pyN9Pgv94lHoSQpVEZKFge4pAQXuJTQA=
X-Received: by 2002:a05:6102:2ac9:b0:4af:98c6:bc97 with SMTP id
ada2fe7eead31-4b2cc45e547mr24615356137.19.1735551422795; Mon, 30 Dec 2024
01:37:02 -0800 (PST)
MIME-Version: 1.0
From: Daniel Khodabakhsh <d.khodabakhsh@HIDDEN>
Date: Mon, 30 Dec 2024 09:36:51 +0000
Message-ID: <CAADuFn+i-a+UZVnqQDF-HZs+p+K9Fcc72XBV+sF_oRPiP26M6Q@HIDDEN>
Subject: [PATCH] Bump esbuild to 0.23.0 and fix node module
To: guix-patches@HIDDEN
Content-Type: multipart/mixed; boundary="0000000000000bafe8062a798eef"
Received-SPF: pass client-ip=2607:f8b0:4864:20::92e;
envelope-from=d.khodabakhsh@HIDDEN; helo=mail-ua1-x92e.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -0.6 (/)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.6 (-)
--0000000000000bafe8062a798eef
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Bump esbuild to 0.23.0.
Also fix the current definition of esbuild-node by renaming it to node-esbu=
ild,
moving it to gnu/packages/node-xyz.scm and using the appropriate build-sys=
tem.
Signed-off-by: Daniel Khodabakhsh <d.khodabakhsh@HIDDEN>
Change-Id: Idb7236362d6e488283222c734a4a096e869d6d2c
---
gnu/packages/cran.scm | 4 ++-
gnu/packages/node-xyz.scm | 57 ++++++++++++++++++++++++++++++++++++++
gnu/packages/web.scm | 58 ++-------------------------------------
3 files changed, 63 insertions(+), 56 deletions(-)
diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm
index aa18931d92..99d14d7b65 100644
--- a/gnu/packages/cran.scm
+++ b/gnu/packages/cran.scm
@@ -39,6 +39,7 @@
;;; Copyright =C2=A9 2022 Greg Hogan <code@HIDDEN>
;;; Copyright =C2=A9 2024 Marco Baggio <guix@HIDDEN>
;;; Copyright =C2=A9 2024 Spencer King <spencer.king@HIDDEN>
+;;; Copyright =C2=A9 2024 Daniel Khodabakhsh <d.khodabakhsh@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -97,6 +98,7 @@ (define-module (gnu packages cran)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages networking)
#:use-module (gnu packages node)
+ #:use-module (gnu packages node-xyz)
#:use-module (gnu packages pcre)
#:use-module (gnu packages pdf)
#:use-module (gnu packages perl)
@@ -2648,7 +2650,7 @@ (define-public r-waiter
"inst/assets/garcon/garcon.min.js"))))))
(propagated-inputs (list r-htmltools r-r6 r-shiny))
(native-inputs
- (list esbuild-node node-lts r-knitr
+ (list node-esbuild node-lts r-knitr
(origin
(method git-fetch)
(uri (git-reference
diff --git a/gnu/packages/node-xyz.scm b/gnu/packages/node-xyz.scm
index e98eda2a01..c11b76495d 100644
--- a/gnu/packages/node-xyz.scm
+++ b/gnu/packages/node-xyz.scm
@@ -7,6 +7,7 @@
;;; Copyright =C2=A9 2021 Dhruvin Gandhi <contact@HIDDEN>
;;; Copyright =C2=A9 2022 Nicolas Graves <ngraves@HIDDEN>
;;; Copyright =C2=A9 2023 Jelle Licht <jlicht@HIDDEN>
+;;; Copyright =C2=A9 2024 Daniel Khodabakhsh <d.khodabakhsh@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -376,6 +377,62 @@ (define-public node-env-variable
@code{localStorage} fallbacks.")
(license license:expat)))
+(define-public node-esbuild
+ (package
+ (name "node-esbuild")
+ (version "0.23.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/evanw/esbuild")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "03014924aaksw5hm8h5j6d7v28vgyqbhhfcn4lfw12fg8bj1hzh0"))=
))
+ (build-system node-build-system)
+ (inputs (list esbuild))
+ (arguments `(
+ #:tests? #f
+ #:modules
+ ((guix build node-build-system)
+ (srfi srfi-1)
+ (ice-9 match)
+ (guix build utils))
+ #:phases (modify-phases %standard-phases
+ (add-after 'unpack 'chdir (lambda _
+ (chdir "npm/esbuild")))
+ (replace 'build (lambda* (#:key inputs #:allow-other-keys)
+ (let
+ ((esbuild-bin
+ (string-append (assoc-ref inputs "esbuild") "/bin/esbuild"))=
)
+ (invoke
+ "node"
+ "../../scripts/esbuild.js"
+ esbuild-bin
+ "--neutral")
+ ; TODO: Once 74900 is merged, replace below with:
+ ; (modify-json (delete-fields '("optionalDependencies",
"scripts")))
+ (with-atomic-json-file-replacement "package.json"
+ (match-lambda
+ ((@ . pkg-meta-alist)
+ (cons '@ (filter
+ (match-lambda
+ (("optionalDependencies" . _) #f)
+ (("scripts" . _) #f)
+ (_ #t))
+ pkg-meta-alist)))))
+ (delete-file "install.js")
+ (delete-file "package-lock.json")
+ (copy-file esbuild-bin "bin/esbuild")))))))
+ (home-page "https://esbuild.github.io/")
+ (synopsis "Node module of ESBuild")
+ (description
+ "The esbuild tool provides a unified bundler, transpiler and
+minifier. It packages up JavaScript and TypeScript code, along with JSON
+and other data, for distribution on the web.")
+ (license license:expat)))
+
(define-public node-far
(package
(name "node-far")
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index b278239c7d..cd427483cc 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -68,6 +68,7 @@
;;; Copyright =C2=A9 2024 Tomas Volf <~@wolfsden.cz>
;;; Copyright =C2=A9 2024 Zheng Junjie <873216071@HIDDEN>
;;; Copyright =C2=A9 2024 Artyom V. Poptsov <poptsov.artyom@HIDDEN>
+;;; Copyright =C2=A9 2024 Daniel Khodabakhsh <d.khodabakhsh@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1950,7 +1951,7 @@ (define-public libpsl
(define-public esbuild
(package
(name "esbuild")
- (version "0.14.0")
+ (version "0.23.0")
(source
(origin
(method git-fetch)
@@ -1959,7 +1960,7 @@ (define-public esbuild
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "09r1xy0kk6c9cpz6q0mxr4why373pwxbm439z2ihq3k1d5kk7x4w"))
+ (base32 "03014924aaksw5hm8h5j6d7v28vgyqbhhfcn4lfw12fg8bj1hzh0"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -2099,59 +2100,6 @@ (define-public websockify
directions.")
(license license:lgpl3)))
-;; This is a variant of esbuild that builds and installs the nodejs API.
-;; Eventually, this should probably be merged with the esbuild package.
-(define-public esbuild-node
- (package
- (inherit esbuild)
- (name "esbuild-node")
- (version (package-version esbuild))
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/evanw/esbuild")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "09r1xy0kk6c9cpz6q0mxr4why373pwxbm439z2ihq3k1d5kk7x4w"))
- (modules '((guix build utils)))
- (snippet
- ;; Remove prebuilt binaries
- '(delete-file-recursively "lib/npm/exit0"))))
- (arguments
- (list
- #:import-path "github.com/evanw/esbuild/cmd/esbuild"
- #:unpack-path "github.com/evanw/esbuild"
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'build 'build-platform
- (lambda* (#:key unpack-path #:allow-other-keys)
- (with-directory-excursion (string-append "src/" unpack-path)
- ;; Must be writable.
- (for-each make-file-writable (find-files "." "."))
- (invoke "node" "scripts/esbuild.js"
- (string-append #$output "/bin/esbuild"))
- (let ((modules (string-append #$output
"/lib/node_modules/esbuild")))
- (mkdir-p modules)
- (copy-recursively "npm/esbuild" modules)))))
- (replace 'check
- (lambda* (#:key tests? unpack-path #:allow-other-keys)
- (when tests?
- ;; The "Go Race Detector" is only supported on 64-bit
- ;; platforms, this variable disables it.
- ;; TODO: Causes too many rebuilds, rewrite to limit to x86=
_64,
- ;; aarch64 and ppc64le.
- #$(if (target-riscv64?)
- `(setenv "ESBUILD_RACE" "")
- #~(unless #$(target-64bit?)
- (setenv "ESBUILD_RACE" "")))
- (with-directory-excursion (string-append "src/" unpack-pat=
h)
- (invoke "make" "test-go"))))))))
- (native-inputs
- (modify-inputs (package-native-inputs esbuild)
- (append node-lts)))))
-
(define-public wwwoffle
(package
(name "wwwoffle")
base-commit: e16cdcf37d8223b3634ec5e658356c3b7f154859
--=20
2.46.0
--0000000000000bafe8062a798eef
Content-Type: text/x-patch; charset="UTF-8"; name="0001-Bump-esbuild-to-0.23.0.patch"
Content-Disposition: attachment;
filename="0001-Bump-esbuild-to-0.23.0.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_m5auhthk0>
X-Attachment-Id: f_m5auhthk0
RnJvbSBkMGI1ODE1YjU3ZmZmMmUyMjZhNzE5MTgyOWM4YWVkZjIzNTUyYjM2IE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpNZXNzYWdlLUlEOiA8ZDBiNTgxNWI1N2ZmZjJlMjI2YTcxOTE4MjljOGFl
ZGYyMzU1MmIzNi4xNzM1NTUwOTYyLmdpdC5kLmtob2RhYmFraHNoQGdtYWlsLmNvbT4KRnJvbTog
RGFuaWVsIEtob2RhYmFraHNoIDxkLmtob2RhYmFraHNoQGdtYWlsLmNvbT4KRGF0ZTogTW9uLCAz
MCBEZWMgMjAyNCAwMToyOToxMSAtMDgwMApTdWJqZWN0OiBbUEFUQ0hdIEJ1bXAgZXNidWlsZCB0
byAwLjIzLjAgYW5kIGZpeCBub2RlIG1vZHVsZS4KCkJ1bXAgZXNidWlsZCB0byAwLjIzLjAuCkFs
c28gZml4IHRoZSBjdXJyZW50IGRlZmluaXRpb24gb2YgZXNidWlsZC1ub2RlIGJ5IHJlbmFtaW5n
IGl0IHRvIG5vZGUtZXNidWlsZCwKIG1vdmluZyBpdCB0byBnbnUvcGFja2FnZXMvbm9kZS14eXou
c2NtIGFuZCB1c2luZyB0aGUgYXBwcm9wcmlhdGUgYnVpbGQtc3lzdGVtLgoKU2lnbmVkLW9mZi1i
eTogRGFuaWVsIEtob2RhYmFraHNoIDxkLmtob2RhYmFraHNoQGdtYWlsLmNvbT4KQ2hhbmdlLUlk
OiBJZGI3MjM2MzYyZDZlNDg4MjgzMjIyYzczNGE0YTA5NmU4NjlkNmQyYwotLS0KIGdudS9wYWNr
YWdlcy9jcmFuLnNjbSAgICAgfCAgNCArKy0KIGdudS9wYWNrYWdlcy9ub2RlLXh5ei5zY20gfCA1
NyArKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogZ251L3BhY2thZ2VzL3dl
Yi5zY20gICAgICB8IDU4ICsrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQog
MyBmaWxlcyBjaGFuZ2VkLCA2MyBpbnNlcnRpb25zKCspLCA1NiBkZWxldGlvbnMoLSkKCmRpZmYg
LS1naXQgYS9nbnUvcGFja2FnZXMvY3Jhbi5zY20gYi9nbnUvcGFja2FnZXMvY3Jhbi5zY20KaW5k
ZXggYWExODkzMWQ5Mi4uOTlkMTRkN2I2NSAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL2NyYW4u
c2NtCisrKyBiL2dudS9wYWNrYWdlcy9jcmFuLnNjbQpAQCAtMzksNiArMzksNyBAQAogOzs7IENv
cHlyaWdodCDCqSAyMDIyIEdyZWcgSG9nYW4gPGNvZGVAZ3JlZ2hvZ2FuLmNvbT4KIDs7OyBDb3B5
cmlnaHQgwqkgMjAyNCBNYXJjbyBCYWdnaW8gPGd1aXhAbWF3dW1hZy5jb20+CiA7OzsgQ29weXJp
Z2h0IMKpIDIwMjQgU3BlbmNlciBLaW5nIDxzcGVuY2VyLmtpbmdAZ2VuZW9zY29weS5jb20+Cis7
OzsgQ29weXJpZ2h0IMKpIDIwMjQgRGFuaWVsIEtob2RhYmFraHNoIDxkLmtob2RhYmFraHNoQGdt
YWlsLmNvbT4KIDs7OwogOzs7IFRoaXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBHdWl4LgogOzs7CkBA
IC05Nyw2ICs5OCw3IEBAIChkZWZpbmUtbW9kdWxlIChnbnUgcGFja2FnZXMgY3JhbikKICAgIzp1
c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgbXVsdGlwcmVjaXNpb24pCiAgICM6dXNlLW1vZHVsZSAo
Z251IHBhY2thZ2VzIG5ldHdvcmtpbmcpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIG5v
ZGUpCisgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIG5vZGUteHl6KQogICAjOnVzZS1tb2R1
bGUgKGdudSBwYWNrYWdlcyBwY3JlKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBwZGYp
CiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHBlcmwpCkBAIC0yNjQ4LDcgKzI2NTAsNyBA
QCAoZGVmaW5lLXB1YmxpYyByLXdhaXRlcgogICAgICAgICAgICAgICAgICAgICAgICAiaW5zdC9h
c3NldHMvZ2FyY29uL2dhcmNvbi5taW4uanMiKSkpKSkpCiAgICAgICAocHJvcGFnYXRlZC1pbnB1
dHMgKGxpc3Qgci1odG1sdG9vbHMgci1yNiByLXNoaW55KSkKICAgICAgIChuYXRpdmUtaW5wdXRz
Ci0gICAgICAgKGxpc3QgZXNidWlsZC1ub2RlIG5vZGUtbHRzIHIta25pdHIKKyAgICAgICAobGlz
dCBub2RlLWVzYnVpbGQgbm9kZS1sdHMgci1rbml0cgogICAgICAgICAgICAgIChvcmlnaW4KICAg
ICAgICAgICAgICAgIChtZXRob2QgZ2l0LWZldGNoKQogICAgICAgICAgICAgICAgKHVyaSAoZ2l0
LXJlZmVyZW5jZQpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL25vZGUteHl6LnNjbSBiL2dudS9w
YWNrYWdlcy9ub2RlLXh5ei5zY20KaW5kZXggZTk4ZWRhMmEwMS4uYzExYjc2NDk1ZCAxMDA2NDQK
LS0tIGEvZ251L3BhY2thZ2VzL25vZGUteHl6LnNjbQorKysgYi9nbnUvcGFja2FnZXMvbm9kZS14
eXouc2NtCkBAIC03LDYgKzcsNyBAQAogOzs7IENvcHlyaWdodCDCqSAyMDIxIERocnV2aW4gR2Fu
ZGhpIDxjb250YWN0QGRocnV2aW4uZGV2PgogOzs7IENvcHlyaWdodCDCqSAyMDIyIE5pY29sYXMg
R3JhdmVzIDxuZ3JhdmVzQG5ncmF2ZXMuZnI+CiA7OzsgQ29weXJpZ2h0IMKpIDIwMjMgSmVsbGUg
TGljaHQgPGpsaWNodEBmc2ZlLm9yZz4KKzs7OyBDb3B5cmlnaHQgwqkgMjAyNCBEYW5pZWwgS2hv
ZGFiYWtoc2ggPGQua2hvZGFiYWtoc2hAZ21haWwuY29tPgogOzs7CiA7OzsgVGhpcyBmaWxlIGlz
IHBhcnQgb2YgR05VIEd1aXguCiA7OzsKQEAgLTM3Niw2ICszNzcsNjIgQEAgKGRlZmluZS1wdWJs
aWMgbm9kZS1lbnYtdmFyaWFibGUKIEBjb2Rle2xvY2FsU3RvcmFnZX0gZmFsbGJhY2tzLiIpCiAg
ICAgKGxpY2Vuc2UgbGljZW5zZTpleHBhdCkpKQogCisoZGVmaW5lLXB1YmxpYyBub2RlLWVzYnVp
bGQKKyAgKHBhY2thZ2UKKyAgICAobmFtZSAibm9kZS1lc2J1aWxkIikKKyAgICAodmVyc2lvbiAi
MC4yMy4wIikKKyAgICAoc291cmNlCisgICAgICAob3JpZ2luCisgICAgICAgIChtZXRob2QgZ2l0
LWZldGNoKQorICAgICAgICAodXJpIChnaXQtcmVmZXJlbmNlCisgICAgICAgICAgKHVybCAiaHR0
cHM6Ly9naXRodWIuY29tL2V2YW53L2VzYnVpbGQiKQorICAgICAgICAgIChjb21taXQgKHN0cmlu
Zy1hcHBlbmQgInYiIHZlcnNpb24pKSkpCisgICAgICAgIChmaWxlLW5hbWUgKGdpdC1maWxlLW5h
bWUgbmFtZSB2ZXJzaW9uKSkKKyAgICAgICAgKHNoYTI1NgorICAgICAgICAgIChiYXNlMzIgIjAz
MDE0OTI0YWFrc3c1aG04aDVqNmQ3djI4dmd5cWJoaGZjbjRsZncxMmZnOGJqMWh6aDAiKSkpKQor
ICAgIChidWlsZC1zeXN0ZW0gbm9kZS1idWlsZC1zeXN0ZW0pCisgICAgKGlucHV0cyAobGlzdCBl
c2J1aWxkKSkKKyAgICAoYXJndW1lbnRzIGAoCisgICAgICAjOnRlc3RzPyAjZgorICAgICAgIzpt
b2R1bGVzCisgICAgICAgKChndWl4IGJ1aWxkIG5vZGUtYnVpbGQtc3lzdGVtKQorICAgICAgICAo
c3JmaSBzcmZpLTEpCisgICAgICAgIChpY2UtOSBtYXRjaCkKKyAgICAgICAgKGd1aXggYnVpbGQg
dXRpbHMpKQorICAgICAgIzpwaGFzZXMgKG1vZGlmeS1waGFzZXMgJXN0YW5kYXJkLXBoYXNlcwor
ICAgICAgICAoYWRkLWFmdGVyICd1bnBhY2sgJ2NoZGlyIChsYW1iZGEgXworICAgICAgICAgIChj
aGRpciAibnBtL2VzYnVpbGQiKSkpCisgICAgICAgIChyZXBsYWNlICdidWlsZCAobGFtYmRhKiAo
IzprZXkgaW5wdXRzICM6YWxsb3ctb3RoZXIta2V5cykKKyAgICAgICAgICAobGV0CisgICAgICAg
ICAgICAoKGVzYnVpbGQtYmluCisgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kIChhc3NvYy1y
ZWYgaW5wdXRzICJlc2J1aWxkIikgIi9iaW4vZXNidWlsZCIpKSkKKyAgICAgICAgICAgIChpbnZv
a2UKKyAgICAgICAgICAgICAgIm5vZGUiCisgICAgICAgICAgICAgICIuLi8uLi9zY3JpcHRzL2Vz
YnVpbGQuanMiCisgICAgICAgICAgICAgIGVzYnVpbGQtYmluCisgICAgICAgICAgICAgICItLW5l
dXRyYWwiKQorICAgICAgICAgICAgOyBUT0RPOiBPbmNlIDc0OTAwIGlzIG1lcmdlZCwgcmVwbGFj
ZSBiZWxvdyB3aXRoOgorICAgICAgICAgICAgOyAobW9kaWZ5LWpzb24gKGRlbGV0ZS1maWVsZHMg
Jygib3B0aW9uYWxEZXBlbmRlbmNpZXMiLCAic2NyaXB0cyIpKSkKKyAgICAgICAgICAgICh3aXRo
LWF0b21pYy1qc29uLWZpbGUtcmVwbGFjZW1lbnQgInBhY2thZ2UuanNvbiIKKyAgICAgICAgICAg
ICAgKG1hdGNoLWxhbWJkYQorICAgICAgICAgICAgICAgICgoQCAuIHBrZy1tZXRhLWFsaXN0KQor
ICAgICAgICAgICAgICAgICAgKGNvbnMgJ0AgKGZpbHRlcgorICAgICAgICAgICAgICAgICAgICAo
bWF0Y2gtbGFtYmRhCisgICAgICAgICAgICAgICAgICAgICAgKCgib3B0aW9uYWxEZXBlbmRlbmNp
ZXMiIC4gXykgI2YpCisgICAgICAgICAgICAgICAgICAgICAgKCgic2NyaXB0cyIgLiBfKSAjZikK
KyAgICAgICAgICAgICAgICAgICAgICAoXyAjdCkpCisgICAgICAgICAgICAgICAgICAgIHBrZy1t
ZXRhLWFsaXN0KSkpKSkKKyAgICAgICAgICAgIChkZWxldGUtZmlsZSAiaW5zdGFsbC5qcyIpCisg
ICAgICAgICAgICAoZGVsZXRlLWZpbGUgInBhY2thZ2UtbG9jay5qc29uIikKKyAgICAgICAgICAg
IChjb3B5LWZpbGUgZXNidWlsZC1iaW4gImJpbi9lc2J1aWxkIikpKSkpKSkKKyAgICAoaG9tZS1w
YWdlICJodHRwczovL2VzYnVpbGQuZ2l0aHViLmlvLyIpCisgICAgKHN5bm9wc2lzICJOb2RlIG1v
ZHVsZSBvZiBFU0J1aWxkIikKKyAgICAoZGVzY3JpcHRpb24KKyAgICAgIlRoZSBlc2J1aWxkIHRv
b2wgcHJvdmlkZXMgYSB1bmlmaWVkIGJ1bmRsZXIsIHRyYW5zcGlsZXIgYW5kCittaW5pZmllci4g
IEl0IHBhY2thZ2VzIHVwIEphdmFTY3JpcHQgYW5kIFR5cGVTY3JpcHQgY29kZSwgYWxvbmcgd2l0
aCBKU09OCithbmQgb3RoZXIgZGF0YSwgZm9yIGRpc3RyaWJ1dGlvbiBvbiB0aGUgd2ViLiIpCisg
ICAgKGxpY2Vuc2UgbGljZW5zZTpleHBhdCkpKQorCiAoZGVmaW5lLXB1YmxpYyBub2RlLWZhcgog
ICAocGFja2FnZQogICAgIChuYW1lICJub2RlLWZhciIpCmRpZmYgLS1naXQgYS9nbnUvcGFja2Fn
ZXMvd2ViLnNjbSBiL2dudS9wYWNrYWdlcy93ZWIuc2NtCmluZGV4IGIyNzgyMzljN2QuLmNkNDI3
NDgzY2MgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy93ZWIuc2NtCisrKyBiL2dudS9wYWNrYWdl
cy93ZWIuc2NtCkBAIC02OCw2ICs2OCw3IEBACiA7OzsgQ29weXJpZ2h0IMKpIDIwMjQgVG9tYXMg
Vm9sZiA8fkB3b2xmc2Rlbi5jej4KIDs7OyBDb3B5cmlnaHQgwqkgMjAyNCBaaGVuZyBKdW5qaWUg
PDg3MzIxNjA3MUBxcS5jb20+CiA7OzsgQ29weXJpZ2h0IMKpIDIwMjQgQXJ0eW9tIFYuIFBvcHRz
b3YgPHBvcHRzb3YuYXJ0eW9tQGdtYWlsLmNvbT4KKzs7OyBDb3B5cmlnaHQgwqkgMjAyNCBEYW5p
ZWwgS2hvZGFiYWtoc2ggPGQua2hvZGFiYWtoc2hAZ21haWwuY29tPgogOzs7CiA7OzsgVGhpcyBm
aWxlIGlzIHBhcnQgb2YgR05VIEd1aXguCiA7OzsKQEAgLTE5NTAsNyArMTk1MSw3IEBAIChkZWZp
bmUtcHVibGljIGxpYnBzbAogKGRlZmluZS1wdWJsaWMgZXNidWlsZAogICAocGFja2FnZQogICAg
IChuYW1lICJlc2J1aWxkIikKLSAgICAodmVyc2lvbiAiMC4xNC4wIikKKyAgICAodmVyc2lvbiAi
MC4yMy4wIikKICAgICAoc291cmNlCiAgICAgIChvcmlnaW4KICAgICAgICAobWV0aG9kIGdpdC1m
ZXRjaCkKQEAgLTE5NTksNyArMTk2MCw3IEBAIChkZWZpbmUtcHVibGljIGVzYnVpbGQKICAgICAg
ICAgICAgICAoY29tbWl0IChzdHJpbmctYXBwZW5kICJ2IiB2ZXJzaW9uKSkpKQogICAgICAgIChm
aWxlLW5hbWUgKGdpdC1maWxlLW5hbWUgbmFtZSB2ZXJzaW9uKSkKICAgICAgICAoc2hhMjU2Ci0g
ICAgICAgIChiYXNlMzIgIjA5cjF4eTBrazZjOWNwejZxMG14cjR3aHkzNzNwd3hibTQzOXoyaWhx
M2sxZDVrazd4NHciKSkKKyAgICAgICAgKGJhc2UzMiAiMDMwMTQ5MjRhYWtzdzVobThoNWo2ZDd2
Mjh2Z3lxYmhoZmNuNGxmdzEyZmc4YmoxaHpoMCIpKQogICAgICAgIChtb2R1bGVzICcoKGd1aXgg
YnVpbGQgdXRpbHMpKSkKICAgICAgICAoc25pcHBldAogICAgICAgICAnKGJlZ2luCkBAIC0yMDk5
LDU5ICsyMTAwLDYgQEAgKGRlZmluZS1wdWJsaWMgd2Vic29ja2lmeQogZGlyZWN0aW9ucy4iKQog
ICAgIChsaWNlbnNlIGxpY2Vuc2U6bGdwbDMpKSkKIAotOzsgVGhpcyBpcyBhIHZhcmlhbnQgb2Yg
ZXNidWlsZCB0aGF0IGJ1aWxkcyBhbmQgaW5zdGFsbHMgdGhlIG5vZGVqcyBBUEkuCi07OyBFdmVu
dHVhbGx5LCB0aGlzIHNob3VsZCBwcm9iYWJseSBiZSBtZXJnZWQgd2l0aCB0aGUgZXNidWlsZCBw
YWNrYWdlLgotKGRlZmluZS1wdWJsaWMgZXNidWlsZC1ub2RlCi0gIChwYWNrYWdlCi0gICAgKGlu
aGVyaXQgZXNidWlsZCkKLSAgICAobmFtZSAiZXNidWlsZC1ub2RlIikKLSAgICAodmVyc2lvbiAo
cGFja2FnZS12ZXJzaW9uIGVzYnVpbGQpKQotICAgIChzb3VyY2UKLSAgICAgKG9yaWdpbgotICAg
ICAgIChtZXRob2QgZ2l0LWZldGNoKQotICAgICAgICh1cmkgKGdpdC1yZWZlcmVuY2UKLSAgICAg
ICAgICAgICAodXJsICJodHRwczovL2dpdGh1Yi5jb20vZXZhbncvZXNidWlsZCIpCi0gICAgICAg
ICAgICAgKGNvbW1pdCAoc3RyaW5nLWFwcGVuZCAidiIgdmVyc2lvbikpKSkKLSAgICAgICAoZmls
ZS1uYW1lIChnaXQtZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpCi0gICAgICAgKHNoYTI1NgotICAg
ICAgICAoYmFzZTMyICIwOXIxeHkwa2s2YzljcHo2cTBteHI0d2h5MzczcHd4Ym00Mzl6MmlocTNr
MWQ1a2s3eDR3IikpCi0gICAgICAgKG1vZHVsZXMgJygoZ3VpeCBidWlsZCB1dGlscykpKQotICAg
ICAgIChzbmlwcGV0Ci0gICAgICAgIDs7IFJlbW92ZSBwcmVidWlsdCBiaW5hcmllcwotICAgICAg
ICAnKGRlbGV0ZS1maWxlLXJlY3Vyc2l2ZWx5ICJsaWIvbnBtL2V4aXQwIikpKSkKLSAgICAoYXJn
dW1lbnRzCi0gICAgIChsaXN0Ci0gICAgICAjOmltcG9ydC1wYXRoICJnaXRodWIuY29tL2V2YW53
L2VzYnVpbGQvY21kL2VzYnVpbGQiCi0gICAgICAjOnVucGFjay1wYXRoICJnaXRodWIuY29tL2V2
YW53L2VzYnVpbGQiCi0gICAgICAjOnBoYXNlcwotICAgICAgI34obW9kaWZ5LXBoYXNlcyAlc3Rh
bmRhcmQtcGhhc2VzCi0gICAgICAgICAgKGFkZC1hZnRlciAnYnVpbGQgJ2J1aWxkLXBsYXRmb3Jt
Ci0gICAgICAgICAgICAobGFtYmRhKiAoIzprZXkgdW5wYWNrLXBhdGggIzphbGxvdy1vdGhlci1r
ZXlzKQotICAgICAgICAgICAgICAod2l0aC1kaXJlY3RvcnktZXhjdXJzaW9uIChzdHJpbmctYXBw
ZW5kICJzcmMvIiB1bnBhY2stcGF0aCkKLSAgICAgICAgICAgICAgICA7OyBNdXN0IGJlIHdyaXRh
YmxlLgotICAgICAgICAgICAgICAgIChmb3ItZWFjaCBtYWtlLWZpbGUtd3JpdGFibGUgKGZpbmQt
ZmlsZXMgIi4iICIuIikpCi0gICAgICAgICAgICAgICAgKGludm9rZSAibm9kZSIgInNjcmlwdHMv
ZXNidWlsZC5qcyIKLSAgICAgICAgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kICMkb3V0
cHV0ICIvYmluL2VzYnVpbGQiKSkKLSAgICAgICAgICAgICAgICAobGV0ICgobW9kdWxlcyAoc3Ry
aW5nLWFwcGVuZCAjJG91dHB1dCAiL2xpYi9ub2RlX21vZHVsZXMvZXNidWlsZCIpKSkKLSAgICAg
ICAgICAgICAgICAgIChta2Rpci1wIG1vZHVsZXMpCi0gICAgICAgICAgICAgICAgICAoY29weS1y
ZWN1cnNpdmVseSAibnBtL2VzYnVpbGQiIG1vZHVsZXMpKSkpKQotICAgICAgICAgIChyZXBsYWNl
ICdjaGVjawotICAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IHRlc3RzPyB1bnBhY2stcGF0aCAj
OmFsbG93LW90aGVyLWtleXMpCi0gICAgICAgICAgICAgICh3aGVuIHRlc3RzPwotICAgICAgICAg
ICAgICAgIDs7IFRoZSAiR28gUmFjZSBEZXRlY3RvciIgaXMgb25seSBzdXBwb3J0ZWQgb24gNjQt
Yml0Ci0gICAgICAgICAgICAgICAgOzsgcGxhdGZvcm1zLCB0aGlzIHZhcmlhYmxlIGRpc2FibGVz
IGl0LgotICAgICAgICAgICAgICAgIDs7IFRPRE86IENhdXNlcyB0b28gbWFueSByZWJ1aWxkcywg
cmV3cml0ZSB0byBsaW1pdCB0byB4ODZfNjQsCi0gICAgICAgICAgICAgICAgOzsgYWFyY2g2NCBh
bmQgcHBjNjRsZS4KLSAgICAgICAgICAgICAgICAjJChpZiAodGFyZ2V0LXJpc2N2NjQ/KQotICAg
ICAgICAgICAgICAgICAgICAgIGAoc2V0ZW52ICJFU0JVSUxEX1JBQ0UiICIiKQotICAgICAgICAg
ICAgICAgICAgICAgICN+KHVubGVzcyAjJCh0YXJnZXQtNjRiaXQ/KQotICAgICAgICAgICAgICAg
ICAgICAgICAgICAoc2V0ZW52ICJFU0JVSUxEX1JBQ0UiICIiKSkpCi0gICAgICAgICAgICAgICAg
KHdpdGgtZGlyZWN0b3J5LWV4Y3Vyc2lvbiAoc3RyaW5nLWFwcGVuZCAic3JjLyIgdW5wYWNrLXBh
dGgpCi0gICAgICAgICAgICAgICAgICAoaW52b2tlICJtYWtlIiAidGVzdC1nbyIpKSkpKSkpKQot
ICAgIChuYXRpdmUtaW5wdXRzCi0gICAgIChtb2RpZnktaW5wdXRzIChwYWNrYWdlLW5hdGl2ZS1p
bnB1dHMgZXNidWlsZCkKLSAgICAgICAoYXBwZW5kIG5vZGUtbHRzKSkpKSkKLQogKGRlZmluZS1w
dWJsaWMgd3d3b2ZmbGUKICAgKHBhY2thZ2UKICAgICAobmFtZSAid3d3b2ZmbGUiKQoKYmFzZS1j
b21taXQ6IGUxNmNkY2YzN2Q4MjIzYjM2MzRlYzVlNjU4MzU2YzNiN2YxNTQ4NTkKLS0gCjIuNDYu
MAoK
--0000000000000bafe8062a798eef--
Daniel Khodabakhsh <d.khodabakhsh@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#75190; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.