From unknown Fri Jun 20 07:27:49 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#51747 <51747@debbugs.gnu.org> To: bug#51747 <51747@debbugs.gnu.org> Subject: Status: [PATCH]: gnu: nix: Update to 2.4. Reply-To: bug#51747 <51747@debbugs.gnu.org> Date: Fri, 20 Jun 2025 14:27:49 +0000 retitle 51747 [PATCH]: gnu: nix: Update to 2.4.=20 reassign 51747 guix-patches submitter 51747 Zhu Zihao severity 51747 normal tag 51747 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 10 07:36:56 2021 Received: (at submit) by debbugs.gnu.org; 10 Nov 2021 12:36:57 +0000 Received: from localhost ([127.0.0.1]:37205 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkmqM-0002RJ-9m for submit@debbugs.gnu.org; Wed, 10 Nov 2021 07:36:56 -0500 Received: from lists.gnu.org ([209.51.188.17]:37376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkmqI-0002R8-4q for submit@debbugs.gnu.org; Wed, 10 Nov 2021 07:36:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mkmqH-0004Md-UX for guix-patches@gnu.org; Wed, 10 Nov 2021 07:36:41 -0500 Received: from mail-m972.mail.163.com ([123.126.97.2]:44938) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mkmqB-00015t-Ng for guix-patches@gnu.org; Wed, 10 Nov 2021 07:36:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=wI/xL hn+WtfZn7XA8agOK7Lvm3DC7KZUOfOjRGiz/dM=; b=FuhSneSeeJRfho4JWKT3z /dvvDVXhTgmqedyFXfWtUp+GSPcvLkLyNEWsNGUjSoyIQqYqpZB4Nt9djrCwwpa3 vxg5eAQEbTXlqahhkOsaKBFYi2b+axas87MZgvq2Jn5CjCIqqS8TX/NZKWIR3JGW cMuqA941C+kc9Xl3rm2E7M= Received: from asus-laptop (unknown [112.95.115.244]) by smtp2 (Coremail) with SMTP id GtxpCgBHfCTMvIths11iIg--.36884S2; Wed, 10 Nov 2021 20:36:29 +0800 (CST) User-agent: mu4e 1.6.9; emacs 27.2 From: Zhu Zihao To: guix-patches@gnu.org Subject: [PATCH]: gnu: nix: Update to 2.4. Date: Wed, 10 Nov 2021 20:35:38 +0800 Message-ID: <86sfw4chme.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: GtxpCgBHfCTMvIths11iIg--.36884S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUhUGYDUUUU X-Originating-IP: [112.95.115.244] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbClgZHr1zmUB3CJQAAso Received-SPF: pass client-ip=123.126.97.2; envelope-from=all_but_last@163.com; helo=mail-m972.mail.163.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.1 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQTUepyLKuOQW1Y9kTW+QrNSqfaCHwUCYYu8yRUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQvkKzUqn2gh+VNQD+Mrga/R7+dhV1gEPnF4VhRZgqYG4S th6FkmqX+k2AqjUA/iBREkIaRWxSrDXMtsPfhMGIPSerKQmQN6J3hl6Z+z8L =F8Cz -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-lowdown.patch Content-Transfer-Encoding: quoted-printable >From 935afdd36fee52fe3930991245ac67e48c0a00ff Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 10 Nov 2021 19:21:45 +0800 Subject: [PATCH 1/3] gnu: Add lowdown. * gnu/packages/markup.scm(lowdown): New variables. --- gnu/packages/markup.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 368976bfde..4ec606f892 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -7,6 +7,7 @@ ;;; Copyright =C2=A9 2020 Marius Bakke ;;; Copyright =C2=A9 2020 EuAndreh ;;; Copyright =C2=A9 2021 Noisytoot +;;; Copyright =C2=A9 2021 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,6 +37,7 @@ (define-module (gnu packages markup) #:use-module (guix utils) #:use-module (gnu packages compression) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -324,3 +326,35 @@ (define-public python-mistletoe swap out renderers for different output formats, without touching any of t= he core components.") (license expat))) + +(define-public lowdown + (package + (name "lowdown") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://kristaps.bsd.lv/lowdown/snapshots/lowd= own-" + version ".tar.gz")) + (sha256 + (base32 "15v2kk4ffqw3n6y6n9plch4qcib3ynnhw0ih8wn2v9qgn4jssp5p")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;No test + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "./configure" + (string-append "PREFIX=3D" out) + (string-append "MANDIR=3D" out "/share/man")))))) + ;; the shared library of nix is linked with lowdown. + #:make-flags '("CFLAGS=3D-fPIC"))) + (native-inputs + `(("which" ,which))) + (home-page "https://kristaps.bsd.lv/lowdown") + (synopsis "Simple Markdown translator") + (description "Lowdown is a Markdown translator producing HTML5, +roff documents in the ms and man formats, LaTeX, gemini, and terminal outp= ut.") + (license isc))) --=20 2.33.1 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0002-gnu-Add-libcpuid.patch Content-Transfer-Encoding: quoted-printable >From d38e131913a006d47d611ce6ebabfb1823d804b8 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 10 Nov 2021 19:31:28 +0800 Subject: [PATCH 2/3] gnu: Add libcpuid. gnu/packages/hardware.scm(libcpuid): New variable. --- gnu/packages/hardware.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 2bf3576d5a..df7fb4b716 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -8,6 +8,7 @@ ;;; Copyright =C2=A9 2021 Petr Hodina ;;; Copyright =C2=A9 2021 Raghav Gururajan ;;; Copyright =C2=A9 2021 Vinicius Monego +;;; Copyright =C2=A9 2021 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -834,3 +835,22 @@ (define-public tpm2-tss libtss2-esys, libtss2-sys, libtss2-mu, libtss2-tcti-device, libtss2-tcti-s= wtpm and libtss2-tcti-mssim.") (license license:bsd-2))) + +(define-public libcpuid + (package + (name "libcpuid") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/anrieff/libcpuid/releases/d= ownload/v" + version "/libcpuid-" version ".tar.gz")) + (sha256 + (base32 "1nksdqk2w1c56lkrjcvh3nss9vq454j81j3yq14lwdn4x8bvmwfr")))) + (build-system gnu-build-system) + (supported-systems '("x86_64-linux" "i686-linux")) + (home-page "https://libcpuid.sourceforge.net/") + (synopsis "A small library for x86 CPU detection and feature extractio= n") + (description "Libcpuid is a small C library to get vendor, model, bran= ding +string, code name and other information from x86 CPU.") + (license license:bsd-2))) --=20 2.33.1 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0003-gnu-nix-Update-to-2.4.patch Content-Transfer-Encoding: quoted-printable >From 51a7de78cebf893ebd15169f6af154b04b734e31 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 10 Nov 2021 19:36:01 +0800 Subject: [PATCH 3/3] gnu: nix: Update to 2.4. * gnu/packages/package-management.scm(nix): Update to 2.4. [source]: Switch to Github repository since upstream no longer provides tarball. [native-inputs]: Add autoconf, autoconf-archive, automake, bison, flex, gcc, googletest, jq, libtool [inputs]: Add libarchive, libcpuid, lowdown, zlib. * gnu/packages/patches/nix-dont-build-html-doc.diff: New file. * gnu/local.mk(dist_patch_DATA): Add corresponding entry. --- gnu/local.mk | 1 + gnu/packages/package-management.scm | 67 +++++++++++++------ .../patches/nix-dont-build-html-doc.diff | 26 +++++++ 3 files changed, 74 insertions(+), 20 deletions(-) create mode 100644 gnu/packages/patches/nix-dont-build-html-doc.diff diff --git a/gnu/local.mk b/gnu/local.mk index 3a849ed2b0..28c01a02ca 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1529,6 +1529,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/nettle-3.5-check-_pkcs1_sec_decrypt-msg-len.patch \ %D%/packages/patches/nettle-3.5-CVE-2021-3580-pt1.patch \ %D%/packages/patches/nettle-3.5-CVE-2021-3580-pt2.patch \ + %D%/packages/patches/nix-dont-build-html-doc.diff \ %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/ngless-unliftio.patch \ diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-man= agement.scm index 3c9d4da941..f45d09db78 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -19,6 +19,7 @@ ;;; Copyright =C2=A9 2020 Vincent Legoll ;;; Copyright =C2=A9 2021 Ivan Gankevich ;;; Copyright =C2=A9 2021 Maxim Cournoyer +;;; Copyright =C2=A9 2021 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,6 +61,8 @@ (define-module (gnu packages package-management) #:use-module (gnu packages dbm) #:use-module (gnu packages docbook) #:use-module (gnu packages file) + #:use-module (gnu packages flex) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -68,12 +71,14 @@ (define-module (gnu packages package-management) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) + #:use-module (gnu packages hardware) #:use-module (gnu packages hurd) #:use-module (gnu packages less) #:use-module (gnu packages libedit) #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages man) + #:use-module (gnu packages markup) #:use-module (gnu packages nettle) #:use-module (gnu packages networking) #:use-module (gnu packages ninja) @@ -596,14 +601,18 @@ (define-public current-guix (define-public nix (package (name "nix") - (version "2.3.16") - (source (origin - (method url-fetch) - (uri (string-append "https://releases.nixos.org/nix/nix-" - version "/nix-" version ".tar.xz")) - (sha256 - (base32 - "1g5aqavr6i3c1xln53w1pdh1kvlxrpnknb105m4jbd85kyv83rky")))) + (version "2.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "http://github.com/NixOS/nix") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1abgfw5ndqklm0x533li32l4azifz3f6lhaxm6s74b704043r7m2")) + (patches + (search-patches "nix-dont-build-html-doc.diff")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--sysconfdir=3D/etc" "--enable-gc") @@ -619,18 +628,36 @@ (define-public nix (string-append "sysconfdir=3D" etc) (string-append "profiledir=3D" etc "/profile.d") make-flags))))))) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("boost" ,boost) - ("brotli" ,brotli) - ("bzip2" ,bzip2) - ("curl" ,curl) - ("editline" ,editline) - ("libgc" ,libgc) - ("libseccomp" ,libseccomp) - ("libsodium" ,libsodium) - ("openssl" ,openssl) - ("sqlite" ,sqlite) - ("xz" ,xz))) + (native-inputs + `(("autoconf" ,autoconf) + ("autoconf-archive" ,autoconf-archive) + ("automake" ,automake) + ("bison" ,bison) + ("flex" ,flex) + ("gcc" ,gcc-9) ;non-trivial designated initialize= rs + ("googletest" ,googletest) + ("jq" ,jq) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (inputs + `(("boost" ,boost) + ("brotli" ,brotli) + ("bzip2" ,bzip2) + ("curl" ,curl) + ("editline" ,editline) + ("libarchive" ,libarchive) + ,@(if (string-prefix? "x86_64" (or (%current-target-system) + (%current-system))) + `(("libcpuid" ,libcpuid)) + '()) + ("libgc" ,libgc) + ("libseccomp" ,libseccomp) + ("libsodium" ,libsodium) + ("lowdown" ,lowdown) + ("openssl" ,openssl) + ("sqlite" ,sqlite) + ("xz" ,xz) + ("zlib" ,zlib))) (home-page "https://nixos.org/nix/") (synopsis "The Nix package manager") (description diff --git a/gnu/packages/patches/nix-dont-build-html-doc.diff b/gnu/packag= es/patches/nix-dont-build-html-doc.diff new file mode 100644 index 0000000000..79142bc215 --- /dev/null +++ b/gnu/packages/patches/nix-dont-build-html-doc.diff @@ -0,0 +1,26 @@ +"--enable-doc-gen" configure flag will enable HTML document generation tha= t requires mdbook. +We can't simply disable it because we need manpages. + +Author: Zhu Zihao + +diff --git a/doc/manual/local.mk b/doc/manual/local.mk +index e43d9f2fb..c323d1847 100644 +--- a/doc/manual/local.mk ++++ b/doc/manual/local.mk +@@ -69,8 +69,6 @@ $(d)/builtins.json: $(bindir)/nix + $(trace-gen) $(dummy-env) NIX_PATH=3Dnix/corepkgs=3Dcorepkgs $(bindir)/n= ix __dump-builtins > $@.tmp + @mv $@.tmp $@ +=20 +-# Generate the HTML manual. +-install: $(docdir)/manual/index.html +=20 + # Generate 'nix' manpages. + install: $(mandir)/man1/nix3-manpages +@@ -94,7 +92,5 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/comman= d-ref/new-cli + done + @touch $@ +=20 +-$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/custom.cs= s $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/command-ref/con= f-file.md $(d)/src/expressions/builtins.md $(call rwildcard, $(d)/src, *.md) +- $(trace-gen) RUST_LOG=3Dwarn mdbook build doc/manual -d $(DESTDIR)$(docd= ir)/manual +=20 + endif --=20 2.33.1 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 10 08:55:09 2021 Received: (at 51747) by debbugs.gnu.org; 10 Nov 2021 13:55:09 +0000 Received: from localhost ([127.0.0.1]:37418 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mko42-0000Yy-50 for submit@debbugs.gnu.org; Wed, 10 Nov 2021 08:55:09 -0500 Received: from mail-m973.mail.163.com ([123.126.97.3]:40386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mko3x-0000Yg-Cx for 51747@debbugs.gnu.org; Wed, 10 Nov 2021 08:54:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=rkVkT FOFJDVkbiJ2U8FI1tyg9Xyh7H5dKZtfzrNHrMo=; b=NxwV5Ke3Jad24GdL0GKfv HaqIVDgGyffgYMqfBgOQo9+zDNRA4VGiuzR02ypGtdzlqyGD67j5pXQllMDnr2Za 5aD00ilSdz85cnr4n6VG5PrWt2Be0jOQAqFqg4eCyaEw9pTrM59iXsLKcHSEWfwO KVLe+R+YWu3DfFHfXL442Y= Received: from asus-laptop (unknown [27.46.106.202]) by smtp3 (Coremail) with SMTP id G9xpCgCHvg4lz4thpXVbQA--.7607S2; Wed, 10 Nov 2021 21:54:46 +0800 (CST) References: <86sfw4chme.fsf@163.com> User-agent: mu4e 1.6.9; emacs 27.2 From: Zhu Zihao To: 51747@debbugs.gnu.org Subject: Re: bug#51747: Acknowledgement ([PATCH]: gnu: nix: Update to 2.4. ) Date: Wed, 10 Nov 2021 21:53:50 +0800 In-reply-to: Message-ID: <864k8kcdzu.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: G9xpCgCHvg4lz4thpXVbQA--.7607S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4RAPESUUUUU X-Originating-IP: [27.46.106.202] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbClhVHr1zmUB5RcgAAs8 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51747 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain little fix. --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQTUepyLKuOQW1Y9kTW+QrNSqfaCHwUCYYvPJRUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQvkKzUqn2gh/WJAEAn+dYitfWbhiISGPRVT9pQHXIWxgF Afs9Dcszz6ov3EEA/2p1RAA/gMp+jUnetkllBMZtRQQkLoN3u5xLtsfJ5pwP =56lZ -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-lowdown.patch Content-Transfer-Encoding: quoted-printable >From 073f513e233470da443b8ee71350e546110fd953 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 10 Nov 2021 19:21:45 +0800 Subject: [PATCH 1/3] gnu: Add lowdown. * gnu/packages/markup.scm (lowdown): New variable. --- gnu/packages/markup.scm | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 368976bfde..35a4513432 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -7,6 +7,7 @@ ;;; Copyright =C2=A9 2020 Marius Bakke ;;; Copyright =C2=A9 2020 EuAndreh ;;; Copyright =C2=A9 2021 Noisytoot +;;; Copyright =C2=A9 2021 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,6 +37,7 @@ (define-module (gnu packages markup) #:use-module (guix utils) #:use-module (gnu packages compression) #:use-module (gnu packages) + #:use-module (gnu packages base) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -324,3 +326,35 @@ (define-public python-mistletoe swap out renderers for different output formats, without touching any of t= he core components.") (license expat))) + +(define-public lowdown + (package + (name "lowdown") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://kristaps.bsd.lv/lowdown/snapshots/lowd= own-" + version ".tar.gz")) + (sha256 + (base32 "15v2kk4ffqw3n6y6n9plch4qcib3ynnhw0ih8wn2v9qgn4jssp5p")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no test + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "./configure" + (string-append "PREFIX=3D" out) + (string-append "MANDIR=3D" out "/share/man")))))) + ;; The shared library of nix is linked with lowdown's static archiv= e. + #:make-flags '("CFLAGS=3D-fPIC"))) + (native-inputs + `(("which" ,which))) + (home-page "https://kristaps.bsd.lv/lowdown") + (synopsis "Simple Markdown translator") + (description "Lowdown is a Markdown translator producing HTML5, +roff documents in the ms and man formats, LaTeX, gemini, and terminal outp= ut.") + (license isc))) --=20 2.33.1 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0002-gnu-Add-libcpuid.patch Content-Transfer-Encoding: quoted-printable >From dcc74bc2cd71b84530bcba8353294c4851eab714 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 10 Nov 2021 19:31:28 +0800 Subject: [PATCH 2/3] gnu: Add libcpuid. gnu/packages/hardware.scm (libcpuid): New variable. --- gnu/packages/hardware.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 2bf3576d5a..fd7de013ef 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -8,6 +8,7 @@ ;;; Copyright =C2=A9 2021 Petr Hodina ;;; Copyright =C2=A9 2021 Raghav Gururajan ;;; Copyright =C2=A9 2021 Vinicius Monego +;;; Copyright =C2=A9 2021 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -834,3 +835,22 @@ (define-public tpm2-tss libtss2-esys, libtss2-sys, libtss2-mu, libtss2-tcti-device, libtss2-tcti-s= wtpm and libtss2-tcti-mssim.") (license license:bsd-2))) + +(define-public libcpuid + (package + (name "libcpuid") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/anrieff/libcpuid/releases/d= ownload/v" + version "/libcpuid-" version ".tar.gz")) + (sha256 + (base32 "1nksdqk2w1c56lkrjcvh3nss9vq454j81j3yq14lwdn4x8bvmwfr")))) + (build-system gnu-build-system) + (supported-systems '("x86_64-linux" "i686-linux")) + (home-page "https://libcpuid.sourceforge.net/") + (synopsis "Small library for x86 CPU detection and feature extraction") + (description "Libcpuid is a small C library to get vendor, model, bran= ding +string, code name and other information from x86 CPU.") + (license license:bsd-2))) --=20 2.33.1 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0003-gnu-nix-Update-to-2.4.patch Content-Transfer-Encoding: quoted-printable >From 84799f061205f8e0627a2a553f113b6c85af6021 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 10 Nov 2021 19:36:01 +0800 Subject: [PATCH 3/3] gnu: nix: Update to 2.4. * gnu/packages/package-management.scm (nix): Update to 2.4. [source]: Switch to Github repository since upstream no longer provides tarball. [native-inputs]: Add autoconf, autoconf-archive, automake, bison, flex, gcc, googletest, jq, libtool [inputs]: Add libarchive, libcpuid, lowdown, zlib. * gnu/packages/patches/nix-dont-build-html-doc.diff: New file. * gnu/local.mk(dist_patch_DATA): Add corresponding entry. --- gnu/local.mk | 1 + gnu/packages/package-management.scm | 67 +++++++++++++------ .../patches/nix-dont-build-html-doc.diff | 26 +++++++ 3 files changed, 74 insertions(+), 20 deletions(-) create mode 100644 gnu/packages/patches/nix-dont-build-html-doc.diff diff --git a/gnu/local.mk b/gnu/local.mk index 3a849ed2b0..28c01a02ca 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1529,6 +1529,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/nettle-3.5-check-_pkcs1_sec_decrypt-msg-len.patch \ %D%/packages/patches/nettle-3.5-CVE-2021-3580-pt1.patch \ %D%/packages/patches/nettle-3.5-CVE-2021-3580-pt2.patch \ + %D%/packages/patches/nix-dont-build-html-doc.diff \ %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/ngless-unliftio.patch \ diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-man= agement.scm index 3c9d4da941..f45d09db78 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -19,6 +19,7 @@ ;;; Copyright =C2=A9 2020 Vincent Legoll ;;; Copyright =C2=A9 2021 Ivan Gankevich ;;; Copyright =C2=A9 2021 Maxim Cournoyer +;;; Copyright =C2=A9 2021 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,6 +61,8 @@ (define-module (gnu packages package-management) #:use-module (gnu packages dbm) #:use-module (gnu packages docbook) #:use-module (gnu packages file) + #:use-module (gnu packages flex) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -68,12 +71,14 @@ (define-module (gnu packages package-management) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) + #:use-module (gnu packages hardware) #:use-module (gnu packages hurd) #:use-module (gnu packages less) #:use-module (gnu packages libedit) #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages man) + #:use-module (gnu packages markup) #:use-module (gnu packages nettle) #:use-module (gnu packages networking) #:use-module (gnu packages ninja) @@ -596,14 +601,18 @@ (define-public current-guix (define-public nix (package (name "nix") - (version "2.3.16") - (source (origin - (method url-fetch) - (uri (string-append "https://releases.nixos.org/nix/nix-" - version "/nix-" version ".tar.xz")) - (sha256 - (base32 - "1g5aqavr6i3c1xln53w1pdh1kvlxrpnknb105m4jbd85kyv83rky")))) + (version "2.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "http://github.com/NixOS/nix") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1abgfw5ndqklm0x533li32l4azifz3f6lhaxm6s74b704043r7m2")) + (patches + (search-patches "nix-dont-build-html-doc.diff")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--sysconfdir=3D/etc" "--enable-gc") @@ -619,18 +628,36 @@ (define-public nix (string-append "sysconfdir=3D" etc) (string-append "profiledir=3D" etc "/profile.d") make-flags))))))) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("boost" ,boost) - ("brotli" ,brotli) - ("bzip2" ,bzip2) - ("curl" ,curl) - ("editline" ,editline) - ("libgc" ,libgc) - ("libseccomp" ,libseccomp) - ("libsodium" ,libsodium) - ("openssl" ,openssl) - ("sqlite" ,sqlite) - ("xz" ,xz))) + (native-inputs + `(("autoconf" ,autoconf) + ("autoconf-archive" ,autoconf-archive) + ("automake" ,automake) + ("bison" ,bison) + ("flex" ,flex) + ("gcc" ,gcc-9) ;non-trivial designated initialize= rs + ("googletest" ,googletest) + ("jq" ,jq) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (inputs + `(("boost" ,boost) + ("brotli" ,brotli) + ("bzip2" ,bzip2) + ("curl" ,curl) + ("editline" ,editline) + ("libarchive" ,libarchive) + ,@(if (string-prefix? "x86_64" (or (%current-target-system) + (%current-system))) + `(("libcpuid" ,libcpuid)) + '()) + ("libgc" ,libgc) + ("libseccomp" ,libseccomp) + ("libsodium" ,libsodium) + ("lowdown" ,lowdown) + ("openssl" ,openssl) + ("sqlite" ,sqlite) + ("xz" ,xz) + ("zlib" ,zlib))) (home-page "https://nixos.org/nix/") (synopsis "The Nix package manager") (description diff --git a/gnu/packages/patches/nix-dont-build-html-doc.diff b/gnu/packag= es/patches/nix-dont-build-html-doc.diff new file mode 100644 index 0000000000..79142bc215 --- /dev/null +++ b/gnu/packages/patches/nix-dont-build-html-doc.diff @@ -0,0 +1,26 @@ +"--enable-doc-gen" configure flag will enable HTML document generation tha= t requires mdbook. +We can't simply disable it because we need manpages. + +Author: Zhu Zihao + +diff --git a/doc/manual/local.mk b/doc/manual/local.mk +index e43d9f2fb..c323d1847 100644 +--- a/doc/manual/local.mk ++++ b/doc/manual/local.mk +@@ -69,8 +69,6 @@ $(d)/builtins.json: $(bindir)/nix + $(trace-gen) $(dummy-env) NIX_PATH=3Dnix/corepkgs=3Dcorepkgs $(bindir)/n= ix __dump-builtins > $@.tmp + @mv $@.tmp $@ +=20 +-# Generate the HTML manual. +-install: $(docdir)/manual/index.html +=20 + # Generate 'nix' manpages. + install: $(mandir)/man1/nix3-manpages +@@ -94,7 +92,5 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/comman= d-ref/new-cli + done + @touch $@ +=20 +-$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/custom.cs= s $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/command-ref/con= f-file.md $(d)/src/expressions/builtins.md $(call rwildcard, $(d)/src, *.md) +- $(trace-gen) RUST_LOG=3Dwarn mdbook build doc/manual -d $(DESTDIR)$(docd= ir)/manual +=20 + endif --=20 2.33.1 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 10 10:49:31 2021 Received: (at 51747) by debbugs.gnu.org; 10 Nov 2021 15:49:31 +0000 Received: from localhost ([127.0.0.1]:39062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkpqk-0008FH-Ph for submit@debbugs.gnu.org; Wed, 10 Nov 2021 10:49:31 -0500 Received: from mail-m975.mail.163.com ([123.126.97.5]:47698) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mkpqd-0008Ez-RU for 51747@debbugs.gnu.org; Wed, 10 Nov 2021 10:49:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=dJWL7 TZUqAiAQbZcR6NfBuEhrRhcr7iZpk0LwwS0BzU=; b=JTGmFNFR+ZjIfRx65uzh8 5F1V/WnOKr72VZv5U0K+zUT/V946qmsMlmx7+5Fw84W3/YpJn1Dn1VNxKJJbZppu xZ5cnADmhTfpXRox7+Am2Ar4n+0sfAKBqCLnAydADmE6UDUlEf6QwLBnKnqknnhL bp9qy/QUZmfcZ4JOyaAh6g= Received: from asus-laptop (unknown [112.95.110.50]) by smtp5 (Coremail) with SMTP id HdxpCgAXYOz06Yth3I94JA--.6553S2; Wed, 10 Nov 2021 23:49:09 +0800 (CST) References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> User-agent: mu4e 1.6.9; emacs 27.2 From: Zhu Zihao To: 51747@debbugs.gnu.org Subject: Re: bug#51747: Acknowledgement ([PATCH]: gnu: nix: Update to 2.4. ) Date: Wed, 10 Nov 2021 23:47:12 +0800 In-reply-to: <864k8kcdzu.fsf@163.com> Message-ID: <861r3oau4u.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: HdxpCgAXYOz06Yth3I94JA--.6553S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUevtZUUUUU X-Originating-IP: [112.95.110.50] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBLxNHr1UMOyEArAABs6 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51747 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain My local source repo is not up-to-date :(, Update to resolve the conflict with newest master. --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQTUepyLKuOQW1Y9kTW+QrNSqfaCHwUCYYvp8RUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQvkKzUqn2gh/ydAD/W0J+8w8Zr6FFM9lKDb3oOTRw95UO 8zqTG0YEJ0vPI0ABAJlMxgtCWdebe0oBbXIzMMyWlGALjbCC9tF75hJt4qoF =s053 -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-lowdown-Generate-position-independent-code.patch >From 369b3cc29ac306d3b2ff9df38163be6d31b0b12b Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 10 Nov 2021 23:36:20 +0800 Subject: [PATCH 1/3] gnu: lowdown: Generate position-independent code. * gnu/packages/markup.scm (lowdown)[arguments]: Use -fPIC. --- gnu/packages/markup.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 06e653a1c9..474b5343e9 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -138,7 +138,9 @@ (define-public lowdown (let ((out (assoc-ref outputs "out"))) (invoke "./configure" (string-append "PREFIX=" out) - (string-append "MANDIR=" out "/share/man")))))))) + (string-append "MANDIR=" out "/share/man")))))) + ;; The shared library of Nix is linked with lowdown's static archive. + #:make-flags '("CFLAGS=-fPIC"))) (native-inputs `(("which" ,which))) (home-page "https://kristaps.bsd.lv/lowdown/") -- 2.33.1 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0002-gnu-Add-libcpuid.patch Content-Transfer-Encoding: quoted-printable >From 032740ed0e85dc20f49133358b1206c4a56efcec Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 10 Nov 2021 23:37:24 +0800 Subject: [PATCH 2/3] gnu: Add libcpuid. * gnu/packages/hardware.scm (libcpuid): New variable. --- gnu/packages/hardware.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 2bf3576d5a..fd7de013ef 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -8,6 +8,7 @@ ;;; Copyright =C2=A9 2021 Petr Hodina ;;; Copyright =C2=A9 2021 Raghav Gururajan ;;; Copyright =C2=A9 2021 Vinicius Monego +;;; Copyright =C2=A9 2021 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -834,3 +835,22 @@ (define-public tpm2-tss libtss2-esys, libtss2-sys, libtss2-mu, libtss2-tcti-device, libtss2-tcti-s= wtpm and libtss2-tcti-mssim.") (license license:bsd-2))) + +(define-public libcpuid + (package + (name "libcpuid") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/anrieff/libcpuid/releases/d= ownload/v" + version "/libcpuid-" version ".tar.gz")) + (sha256 + (base32 "1nksdqk2w1c56lkrjcvh3nss9vq454j81j3yq14lwdn4x8bvmwfr")))) + (build-system gnu-build-system) + (supported-systems '("x86_64-linux" "i686-linux")) + (home-page "https://libcpuid.sourceforge.net/") + (synopsis "Small library for x86 CPU detection and feature extraction") + (description "Libcpuid is a small C library to get vendor, model, bran= ding +string, code name and other information from x86 CPU.") + (license license:bsd-2))) --=20 2.33.1 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0003-gnu-nix-Update-to-2.4.patch Content-Transfer-Encoding: quoted-printable >From a41118f1b3ddc3d26036f84161a91accd9d98968 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 10 Nov 2021 23:37:53 +0800 Subject: [PATCH 3/3] gnu: nix: Update to 2.4. * gnu/packages/package-management.scm (nix): Update to 2.4. [source]: Switch to Github repository since upstream no longer provides tarball. [native-inputs]: Add autoconf, autoconf-archive, automake, bison, flex, gcc, googletest, jq, libtool [inputs]: Add libarchive, libcpuid, lowdown, zlib. * gnu/packages/patches/nix-dont-build-html-doc.diff: New file. * gnu/local.mk(dist_patch_DATA): Add corresponding entry. --- gnu/local.mk | 1 + gnu/packages/package-management.scm | 67 +++++++++++++------ .../patches/nix-dont-build-html-doc.diff | 26 +++++++ 3 files changed, 74 insertions(+), 20 deletions(-) create mode 100644 gnu/packages/patches/nix-dont-build-html-doc.diff diff --git a/gnu/local.mk b/gnu/local.mk index 05258ac054..c32d2ba297 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1527,6 +1527,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/nettle-3.5-check-_pkcs1_sec_decrypt-msg-len.patch \ %D%/packages/patches/nettle-3.5-CVE-2021-3580-pt1.patch \ %D%/packages/patches/nettle-3.5-CVE-2021-3580-pt2.patch \ + %D%/packages/patches/nix-dont-build-html-doc.diff \ %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/ngless-unliftio.patch \ diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-man= agement.scm index 12c689e9e2..a30eea4d62 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -19,6 +19,7 @@ ;;; Copyright =C2=A9 2020 Vincent Legoll ;;; Copyright =C2=A9 2021 Ivan Gankevich ;;; Copyright =C2=A9 2021 Maxim Cournoyer +;;; Copyright =C2=A9 2021 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,6 +61,8 @@ (define-module (gnu packages package-management) #:use-module (gnu packages dbm) #:use-module (gnu packages docbook) #:use-module (gnu packages file) + #:use-module (gnu packages flex) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -68,12 +71,14 @@ (define-module (gnu packages package-management) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) + #:use-module (gnu packages hardware) #:use-module (gnu packages hurd) #:use-module (gnu packages less) #:use-module (gnu packages libedit) #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages man) + #:use-module (gnu packages markup) #:use-module (gnu packages nettle) #:use-module (gnu packages networking) #:use-module (gnu packages ninja) @@ -593,14 +598,18 @@ (define-public current-guix (define-public nix (package (name "nix") - (version "2.3.16") - (source (origin - (method url-fetch) - (uri (string-append "https://releases.nixos.org/nix/nix-" - version "/nix-" version ".tar.xz")) - (sha256 - (base32 - "1g5aqavr6i3c1xln53w1pdh1kvlxrpnknb105m4jbd85kyv83rky")))) + (version "2.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "http://github.com/NixOS/nix") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1abgfw5ndqklm0x533li32l4azifz3f6lhaxm6s74b704043r7m2")) + (patches + (search-patches "nix-dont-build-html-doc.diff")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--sysconfdir=3D/etc" "--enable-gc") @@ -616,18 +625,36 @@ (define-public nix (string-append "sysconfdir=3D" etc) (string-append "profiledir=3D" etc "/profile.d") make-flags))))))) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("boost" ,boost) - ("brotli" ,brotli) - ("bzip2" ,bzip2) - ("curl" ,curl) - ("editline" ,editline) - ("libgc" ,libgc) - ("libseccomp" ,libseccomp) - ("libsodium" ,libsodium) - ("openssl" ,openssl) - ("sqlite" ,sqlite) - ("xz" ,xz))) + (native-inputs + `(("autoconf" ,autoconf) + ("autoconf-archive" ,autoconf-archive) + ("automake" ,automake) + ("bison" ,bison) + ("flex" ,flex) + ("gcc" ,gcc-9) ;non-trivial designated initialize= rs + ("googletest" ,googletest) + ("jq" ,jq) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (inputs + `(("boost" ,boost) + ("brotli" ,brotli) + ("bzip2" ,bzip2) + ("curl" ,curl) + ("editline" ,editline) + ("libarchive" ,libarchive) + ,@(if (string-prefix? "x86_64" (or (%current-target-system) + (%current-system))) + `(("libcpuid" ,libcpuid)) + '()) + ("libgc" ,libgc) + ("libseccomp" ,libseccomp) + ("libsodium" ,libsodium) + ("lowdown" ,lowdown) + ("openssl" ,openssl) + ("sqlite" ,sqlite) + ("xz" ,xz) + ("zlib" ,zlib))) (home-page "https://nixos.org/nix/") (synopsis "The Nix package manager") (description diff --git a/gnu/packages/patches/nix-dont-build-html-doc.diff b/gnu/packag= es/patches/nix-dont-build-html-doc.diff new file mode 100644 index 0000000000..79142bc215 --- /dev/null +++ b/gnu/packages/patches/nix-dont-build-html-doc.diff @@ -0,0 +1,26 @@ +"--enable-doc-gen" configure flag will enable HTML document generation tha= t requires mdbook. +We can't simply disable it because we need manpages. + +Author: Zhu Zihao + +diff --git a/doc/manual/local.mk b/doc/manual/local.mk +index e43d9f2fb..c323d1847 100644 +--- a/doc/manual/local.mk ++++ b/doc/manual/local.mk +@@ -69,8 +69,6 @@ $(d)/builtins.json: $(bindir)/nix + $(trace-gen) $(dummy-env) NIX_PATH=3Dnix/corepkgs=3Dcorepkgs $(bindir)/n= ix __dump-builtins > $@.tmp + @mv $@.tmp $@ +=20 +-# Generate the HTML manual. +-install: $(docdir)/manual/index.html +=20 + # Generate 'nix' manpages. + install: $(mandir)/man1/nix3-manpages +@@ -94,7 +92,5 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/comman= d-ref/new-cli + done + @touch $@ +=20 +-$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/custom.cs= s $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/command-ref/con= f-file.md $(d)/src/expressions/builtins.md $(call rwildcard, $(d)/src, *.md) +- $(trace-gen) RUST_LOG=3Dwarn mdbook build doc/manual -d $(DESTDIR)$(docd= ir)/manual +=20 + endif --=20 2.33.1 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Nov 17 06:22:02 2021 Received: (at 51747) by debbugs.gnu.org; 17 Nov 2021 11:22:02 +0000 Received: from localhost ([127.0.0.1]:60317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnJ0s-0002Pk-K5 for submit@debbugs.gnu.org; Wed, 17 Nov 2021 06:22:02 -0500 Received: from mail-m974.mail.163.com ([123.126.97.4]:33586) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnJ0m-0002P0-WF for 51747@debbugs.gnu.org; Wed, 17 Nov 2021 06:22:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=12tf0 mrvt2D06+GQDbLD2WuD90KCZHKgLRrNZDWi8D8=; b=LBxwAX0yu/yt3d7lVG9Kc IuQ278yZurFOs3iIvyCKnPLRXLoMdNs3DHDi/iM+KX1GDTlfd0/YB4VSx2HcCdUh 43nu9Jl65bV1F9oCDmlbVDju/4e5G3FIegNZwbARaIJgFQQ0bwWY0GlAsb/7iDHL UhneqNyARGu/PIxx1fYCbI= Received: from asus-laptop (unknown [112.95.110.50]) by smtp4 (Coremail) with SMTP id HNxpCgBXfDnO5ZRh+lLULw--.30292S2; Wed, 17 Nov 2021 19:21:51 +0800 (CST) References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> User-agent: mu4e 1.6.9; emacs 27.2 From: Zhu Zihao To: 51747@debbugs.gnu.org Subject: Re: bug#51747: Acknowledgement ([PATCH]: gnu: nix: Update to 2.4. ) Date: Wed, 17 Nov 2021 19:21:40 +0800 In-reply-to: <861r3oau4u.fsf@163.com> Message-ID: <86lf1njad0.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: HNxpCgBXfDnO5ZRh+lLULw--.30292S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUePfHDUUUU X-Originating-IP: [112.95.110.50] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbClglOr1zmUG++5wABsj X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51747 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable ping. =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQTUepyLKuOQW1Y9kTW+QrNSqfaCHwUCYZTlyxUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQvkKzUqn2gh+JagEA4cFB9eUGpcbDvvIqppYhzCWl/Xwu Y6ixWl5Ye1xcwk4BAIchAnXWEs71S2VSdIa/WI4Sg8onrtnf+8U3+CNT938P =SqSO -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Dec 04 10:30:43 2021 Received: (at 51747) by debbugs.gnu.org; 4 Dec 2021 15:30:43 +0000 Received: from localhost ([127.0.0.1]:54740 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mtWzr-0000wa-EW for submit@debbugs.gnu.org; Sat, 04 Dec 2021 10:30:43 -0500 Received: from mail-m974.mail.163.com ([123.126.97.4]:35800) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mtWzp-0000wN-Ch for 51747@debbugs.gnu.org; Sat, 04 Dec 2021 10:30:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=DZGkY 0HIqhyQOeMfak+Fcke2rWgL9+mb7RlFQqW0LnU=; b=PNX35oDltk6ner/dX0gQe 4KqdqWW//TPH8ssPkgN8JwAHDupc/HRZRUgOliDA+NpUczTeR465+tT9A35vElKj /yvZ7z5A7vtdT1QSHWvUJ+tbib4mfHXXYJckFZhgHkU/HtTYt4ztBT2aKjkVksex Cd4nGpquo0b2RcQrnx7MH4= Received: from asus-laptop (unknown [112.95.113.236]) by smtp4 (Coremail) with SMTP id HNxpCgA3yxCbiathWAX4AA--.36012S2; Sat, 04 Dec 2021 23:30:36 +0800 (CST) References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> <86lf1njad0.fsf@163.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: 51747@debbugs.gnu.org Subject: Re: bug#51747: Acknowledgement ([PATCH]: gnu: nix: Update to 2.4. ) Date: Sat, 04 Dec 2021 23:28:20 +0800 In-reply-to: <86lf1njad0.fsf@163.com> Message-ID: <86ilw4e6av.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: HNxpCgA3yxCbiathWAX4AA--.36012S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUxG-eUUUUU X-Originating-IP: [112.95.113.236] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiKQJfr1Xl2s1pHQACsK X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51747 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Ping again. I know you guys are hard working on core-updates-frozen branch. But I can't see a deadline for merging it into master. Does it really worth abandoning non-trivial patches for master branch? IDK.= ... Zhu Zihao writes: > [[PGP Signed Part:Undecided]] > > ping. =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQTUepyLKuOQW1Y9kTW+QrNSqfaCHwUCYauJmBUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQvkKzUqn2gh+K1AEA/LYdJmh5QzzWKgRypZfxIHGdFQqN 04+P7NuHGhwH0bcA/A9HelPDUsnWaH5J5oh/UeDYpVs0Q6+hJ2jUs4wRbdUC =nwS3 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 11 03:23:32 2022 Received: (at 51747) by debbugs.gnu.org; 11 Jan 2022 08:23:32 +0000 Received: from localhost ([127.0.0.1]:54072 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7CR9-0001Oe-A9 for submit@debbugs.gnu.org; Tue, 11 Jan 2022 03:23:32 -0500 Received: from mail-lf1-f41.google.com ([209.85.167.41]:45817) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7CR3-0001OM-Tf for 51747@debbugs.gnu.org; Tue, 11 Jan 2022 03:23:21 -0500 Received: by mail-lf1-f41.google.com with SMTP id u13so53348535lff.12 for <51747@debbugs.gnu.org>; Tue, 11 Jan 2022 00:23:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=qBxO9m1q411Jcflivt685eYRfyfZX1A13AgcfWGQKYo=; b=U21xH6ruN/VM/mwy3gYt/gNeG+uW4Tg1/smByQ5bM5dyJlTsWOzxE0uuA5x5UXND9S XrIAePG9rybZcgE+o3vIaOaPtOvD4OUv78juMJWCbbO+CnnUqsWy/sRg+Nyk0vMjljs+ lmYjgXZU704n5xIrq7gyf4CdstZ+Go1DKA9cqQ4mrXE22QccJGmpFQM6ONulWxe1PxLs +dfr82UV5hJvcXJmhZCXux3Wr2A321h9aYQ2yfL2SW40B+XyEvlQF8ejrTY5hhoh/a13 DRmOtrzbLNjr4c+m/6pEj90v5JICp0aEGcssb+nj/8KmhNUV9i6PWJdV2o8iBInOuX5Q OkAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=qBxO9m1q411Jcflivt685eYRfyfZX1A13AgcfWGQKYo=; b=e6utZj4K6eT86zJO3MBR1xAxEE6sTup+I7EgiO2uhopctQGN6e7ggpfmFofzwgwPFf skx9gO7ipZ+PA7WWRqG9AuE6D5rWPpNRW64d4ur8CyhcvDZLLiRchXHb7y13Yk8o7pKP JfVY5SZTDdAckaFzCaapwI5Bj0PjlLMhWoYX66Nrg5ABDFL91tsn9ARzvhLTTcO80Lw+ pYrtIV8/eEjdAGnEF7cGD3CsTNMpjRTZOIduD+k9XZMLAYed7NQEoDzhxdImGZ2X8B6B hKReOKbNxCHiLFyEhp0mXrhwoodZQPDBh+TcGPXaAavWggbTuEXqX+83ihguOGW067K3 Xnuw== X-Gm-Message-State: AOAM531ZHcvAt27CbiFEtTHpc4XqevuVqpa7QUAVsDpzmC0aRYjoXpje ZcC/5T3ndpTdxItEbjX5xyfAHtXNAVo= X-Google-Smtp-Source: ABdhPJzOOK9I7CjcPq3zSbToXmtbahosamyJvPEE7D2MhHRsZ2D0lfOstYWUokRh7PaOPHkhYR6NQQ== X-Received: by 2002:a19:8c4a:: with SMTP id i10mr2530732lfj.537.1641889391457; Tue, 11 Jan 2022 00:23:11 -0800 (PST) Received: from guixsd ([88.201.161.72]) by smtp.gmail.com with ESMTPSA id w6sm1266702lfd.68.2022.01.11.00.23.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 00:23:10 -0800 (PST) From: Oleg Pykhalov To: Zhu Zihao Subject: Re: bug#51747: [PATCH]: gnu: nix: Update to 2.4. References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> <86lf1njad0.fsf@163.com> <86ilw4e6av.fsf@163.com> Date: Tue, 11 Jan 2022 11:23:03 +0300 In-Reply-To: <86ilw4e6av.fsf@163.com> (Zhu Zihao's message of "Sat, 04 Dec 2021 23:28:20 +0800") Message-ID: <87y23mheag.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi, apologies for the slow response. Zhu Zihao writes: > Ping again. > > I know you guys are hard working on core-updates-frozen branch. But I > can't see a deadline for merging it into master. > > Does it really worth abandoning non-trivial patches for m [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: liltechdude.xyz (xyz)] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (go.wigust[at]gmail.com) -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.167.41 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.167.41 listed in wl.mailspike.net] X-Debbugs-Envelope-To: 51747 Cc: 51747@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hi, apologies for the slow response. Zhu Zihao writes: > Ping again. > > I know you guys are hard working on core-updates-frozen branch. But I > can't see a deadline for merging it into master. > > Does it really worth abandoning non-trivial patches for master branch? IDK.... I tried to apply patches, but it does not build on the current origin/master 537f4a1ef1cc385526b0662b2a9a1754319e1020 Updated patches on 537f4a1e and build log attached. If you know what's the issue, please respond. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-libcpuid.patch Content-Transfer-Encoding: quoted-printable From=203ec635be703c947b0b031eb79136037d07eeedd1 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 11 Jan 2022 10:07:17 +0300 Subject: [PATCH 1/2] gnu: Add libcpuid. * gnu/packages/hardware.scm (libcpuid): New variable. =2D-- gnu/packages/hardware.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 8727f0f20a..a2708e6b90 100644 =2D-- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -9,6 +9,7 @@ ;;; Copyright =C2=A9 2021 Raghav Gururajan ;;; Copyright =C2=A9 2021 Vinicius Monego ;;; Copyright =C2=A9 2021, 2022 John Kehayias +;;; Copyright =C2=A9 2022 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -953,3 +954,22 @@ (define-public tpm2-tss libtss2-esys, libtss2-sys, libtss2-mu, libtss2-tcti-device, libtss2-tcti-s= wtpm and libtss2-tcti-mssim.") (license license:bsd-2))) + +(define-public libcpuid + (package + (name "libcpuid") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/anrieff/libcpuid/releases/d= ownload/v" + version "/libcpuid-" version ".tar.gz")) + (sha256 + (base32 "1nksdqk2w1c56lkrjcvh3nss9vq454j81j3yq14lwdn4x8bvmwfr")))) + (build-system gnu-build-system) + (supported-systems '("x86_64-linux" "i686-linux")) + (home-page "https://libcpuid.sourceforge.net/") + (synopsis "Small library for x86 CPU detection and feature extraction") + (description "Libcpuid is a small C library to get vendor, model, bran= ding +string, code name and other information from x86 CPU.") + (license license:bsd-2))) =2D-=20 2.34.0 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: attachment; filename=0002-gnu-nix-Update-to-2.4.patch Content-Transfer-Encoding: quoted-printable From=2000cc1e637a8b3a5a4b508673733c94b9f2bdcb40 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 11 Jan 2022 10:25:09 +0300 Subject: [PATCH 2/2] gnu: nix: Update to 2.4. * gnu/packages/package-management.scm (nix): Update to 2.4. [source]: Switch to Github repository since upstream no longer provides tarball. [native-inputs]: Add autoconf, autoconf-archive, automake, bison, flex, gcc, googletest, jq, libtool. [inputs]: Add libarchive, libcpuid, lowdown, zlib. * gnu/packages/patches/nix-dont-build-html-doc.patch: New file. * gnu/local.mk(dist_patch_DATA): Add corresponding entry. =2D-- gnu/local.mk | 2 + gnu/packages/package-management.scm | 66 +++++++++++++------ .../patches/nix-dont-build-html-doc.patch | 26 ++++++++ 3 files changed, 74 insertions(+), 20 deletions(-) create mode 100644 gnu/packages/patches/nix-dont-build-html-doc.patch diff --git a/gnu/local.mk b/gnu/local.mk index d5e19adea6..95c0e34e57 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -47,6 +47,7 @@ # Copyright =C2=A9 2021 Dmitry Polyakov # Copyright =C2=A9 2021 Andrew Tropin # Copyright =C2=A9 2021 Simon Tournier +# Copyright =C2=A9 2022 Zhu Zihao # # This file is part of GNU Guix. # @@ -1511,6 +1512,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/nettle-3.5-check-_pkcs1_sec_decrypt-msg-len.patch \ %D%/packages/patches/nettle-3.5-CVE-2021-3580-pt1.patch \ %D%/packages/patches/nettle-3.5-CVE-2021-3580-pt2.patch \ + %D%/packages/patches/nix-dont-build-html-doc.patch \ %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/ngless-unliftio.patch \ diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-man= agement.scm index 265763cc74..4b41c01dff 100644 =2D-- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -20,6 +20,7 @@ ;;; Copyright =C2=A9 2021 Ivan Gankevich ;;; Copyright =C2=A9 2021 Maxim Cournoyer ;;; Copyright =C2=A9 2021 John Kehayias +;;; Copyright =C2=A9 2022 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -62,6 +63,8 @@ (define-module (gnu packages package-management) #:use-module (gnu packages dbm) #:use-module (gnu packages docbook) #:use-module (gnu packages file) + #:use-module (gnu packages flex) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -70,6 +73,7 @@ (define-module (gnu packages package-management) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) + #:use-module (gnu packages hardware) #:use-module (gnu packages hurd) #:use-module (gnu packages imagemagick) #:use-module (gnu packages less) @@ -77,6 +81,7 @@ (define-module (gnu packages package-management) #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages man) + #:use-module (gnu packages markup) #:use-module (gnu packages nettle) #:use-module (gnu packages networking) #:use-module (gnu packages ninja) @@ -657,14 +662,18 @@ (define-public guix-icons (define-public nix (package (name "nix") =2D (version "2.3.16") =2D (source (origin =2D (method url-fetch) =2D (uri (string-append "https://releases.nixos.org/nix/nix-" =2D version "/nix-" version ".tar.xz")) =2D (sha256 =2D (base32 =2D "1g5aqavr6i3c1xln53w1pdh1kvlxrpnknb105m4jbd85kyv83rky")))) + (version "2.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "http://github.com/NixOS/nix") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1abgfw5ndqklm0x533li32l4azifz3f6lhaxm6s74b704043r7m2")) + (patches + (search-patches "nix-dont-build-html-doc.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--sysconfdir=3D/etc" "--enable-gc") @@ -680,18 +689,35 @@ (define-public nix (string-append "sysconfdir=3D" etc) (string-append "profiledir=3D" etc "/profile.d") make-flags))))))) =2D (native-inputs (list pkg-config)) =2D (inputs (list boost =2D brotli =2D bzip2 =2D curl =2D editline =2D libgc =2D libseccomp =2D libsodium =2D openssl =2D sqlite =2D xz)) + (native-inputs (list autoconf + autoconf-archive + automake + bison + flex + gcc-9 ;non-trivial designated initializers + googletest + jq + libtool + pkg-config)) + (inputs (append + (list boost + brotli + bzip2 + curl + editline + libarchive + libgc + libseccomp + libsodium + lowdown + openssl + sqlite + xz + zlib) + (if (string-prefix? "x86_64" (or (%current-target-system) + (%current-system))) + (list libcpuid) + '()))) (home-page "https://nixos.org/nix/") (synopsis "The Nix package manager") (description diff --git a/gnu/packages/patches/nix-dont-build-html-doc.patch b/gnu/packa= ges/patches/nix-dont-build-html-doc.patch new file mode 100644 index 0000000000..79142bc215 =2D-- /dev/null +++ b/gnu/packages/patches/nix-dont-build-html-doc.patch @@ -0,0 +1,26 @@ +"--enable-doc-gen" configure flag will enable HTML document generation tha= t requires mdbook. +We can't simply disable it because we need manpages. + +Author: Zhu Zihao + +diff --git a/doc/manual/local.mk b/doc/manual/local.mk +index e43d9f2fb..c323d1847 100644 +--- a/doc/manual/local.mk ++++ b/doc/manual/local.mk +@@ -69,8 +69,6 @@ $(d)/builtins.json: $(bindir)/nix + $(trace-gen) $(dummy-env) NIX_PATH=3Dnix/corepkgs=3Dcorepkgs $(bindir)/n= ix __dump-builtins > $@.tmp + @mv $@.tmp $@ +=20 +-# Generate the HTML manual. +-install: $(docdir)/manual/index.html +=20 + # Generate 'nix' manpages. + install: $(mandir)/man1/nix3-manpages +@@ -94,7 +92,5 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/comman= d-ref/new-cli + done + @touch $@ +=20 +-$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/custom.cs= s $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/command-ref/con= f-file.md $(d)/src/expressions/builtins.md $(call rwildcard, $(d)/src, *.md) +- $(trace-gen) RUST_LOG=3Dwarn mdbook build doc/manual -d $(DESTDIR)$(docd= ir)/manual +=20 + endif =2D-=20 2.34.0 --=-=-= Content-Type: application/octet-stream Content-Disposition: attachment; filename=y9ipph0dhrbvliwacg8jl01j63c4r2-nix-2.4.drv.bz2 Content-Transfer-Encoding: base64 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 aO9FkEgmeY5FkdqWRz56NsY80vCOMeRX3j1Ppd80bptWSuxrcmWh95DGV/Gx9pmRNYyYNXvbe4Gj e1NaYOF8cRERHBHIIETCowqWAz4pAJJUIQbzFYJpaKFQxCFCqQgBAgqsGApSpJKolUmtmMnxG4xi 3FwuT7i4QFDRBDGO6SyAzEhgSG8vFFJpmdbQBRiUOTgUxLzQx2SeFl0XE0mYCxAucwK9DKN6uTRG +KjLZbWpcRTWYbm2cCknYrE1hsUbVTk2tb7NGu27o1sziDYbJOKxh9c9Tc61YdG2l4G16zebAPtY Gw6D8cooQRgjTkVB12VGDVKzGpVQrSQUrQXSRFGiAXpoqoBEQECiWsLKw53JDGiMbxELFGBZtq50 wbZzsKi3CZUOOpKfVLM23Lc5TjOEao3GhKMyUaxxPeaxVTKr48G2gwOs4IwPAL6t3DNSJmKTLo4m WurbZbyG9lVXTZKtt+x/gSHz/oxCQTz4fHbXt25y6/Q+b58NKWjPlj4XnVZxE8r25d+HPLq9NcTl 8uWlZ3rThULO1Y17+Mv1cSt35BHihi/dBDbbbaVVSWjWNtgACKK2qwRoAiI1rFW1RIGwdvr7BAiP PCe6r/K/31e/1LzAuIXlhaidmLH87x5HqreGrX9oC9hqgAA+76bxUtMxMuw2EIEkJIPohEHsbEMe ggEGMPGB0zEctENiJ0lltq2llb3romE5wDWzhFDaNwECSXAbiGMobIA44Um00xwqJG4IZYiUfOEc JyyNyaWDZNDDQvbdsxjBEYKDmqkVjaMEu4l9X7bsyd7cgP1BK6X9Jo3NN7Hw6oiT/DXr5xtOjBTH J3yHBsK73lu9RVsn2IuPpO+8Oj+NWWcTHt19VtWmNOcveXw7RDOql0wLjd9zFJRn73xERy0bG+qe MYxjR25JXkofg4hbX2HD6nZ9r6S831XUhzqpl+uGhzHUvnRQMa7YgQURHRB+mqzWl+kPYZTF3uWR oi5iAH6u2xUnnVO1TZmdJtaNGx3TjcG7IdIXLXTMnOJxdtJu9HYyXzdPdXnfC64gyQypNHiYbz2G x5SCy2z3ys0OsZbsIr5c+OE+G1/fxp+fo6xI1XrnQRp0nkUzPr9J/hOb+NF27IPEGtluV8rM/DYL Oqwg/Xjl1jad2A05jom6reuseRHa9cz0hzqfLTPfywiJ78KnQyRthoho58d+/byx3zpy0K7aFxWo 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 Kdk0f/i7kinChIeqxmIw --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJIBAEBCgAyFiEEcjhxI46s62NFSFhXFn+OpQAa+pwFAmHdPmcUHGdvLndpZ3Vz dEBnbWFpbC5jb20ACgkQFn+OpQAa+pz95BAArZh9xv9Ry4RDkc5WNP17YiB0TjDd FGE8O6jnZ+/2rzuZ5SRDG5uuw2rq1PxVgLAcYTJluB2bNayaa7Gwg5DhhGzCNt+u owTWhXPJoHWQZE9nTkBNeJaE7MjsKno3VcAgx3c/+Sb+NQUlCWdqbmcsVRQiotu6 LSNmq24hHDOYvOSG2zurp2ITLdIUJJ/JhqmGjUCODajiUQRKxb1mn8qx+LUKBWBU cELYDaPlQ8ijQN4+6dfCPjHL/4nTbN5CpFkTURDRGgHS9xBodkVeg+m55wdnJLmx r6Tl2gFe1JJEoai7ZHlQPXUsGzjHAegLcPqJASLkkPrVUT9Me9zhGSgUcCHx92E8 fqYWkfLkNKnxfzoO3NjB00BqFfLi5P62V+evi4ecRjcks0QBcODHsxwpxTbffMmj jGoWyW40szxNhkA9Co8RGP3DrG8EcLKmkwKdUvIUuStel6xqBdWGWSB/sk3z0xYl RrzFfQ7XD0YnpfzVjypEukTB6F2dpa21EOq7OAvEH5FvbEIcDaG5YlEv+x5uRhjE tgkLJVu3n4digKHCQolg0LuTgleuv7EGLoAPcaLq5PQusqrJa2++eYJe9+cFMvKG cdRNrL0S08WKXOPf6EPGGmCVDhUYV5/Q/ocZsGws+VIzB+8gw5+YEhu+gDZg8zIV ZokW7RnKyYof3NM= =c+uM -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 11 04:49:58 2022 Received: (at 51747) by debbugs.gnu.org; 11 Jan 2022 09:49:58 +0000 Received: from localhost ([127.0.0.1]:54175 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7Dmw-0003n1-C5 for submit@debbugs.gnu.org; Tue, 11 Jan 2022 04:49:58 -0500 Received: from [123.126.97.1] (port=56338 helo=mail-m971.mail.163.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7Dmr-0003mc-SY for 51747@debbugs.gnu.org; Tue, 11 Jan 2022 04:49:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=V65Ln WcdQNjkuwdaEhn0+wrwsChunRmoz2trOEqN7tE=; b=Ob2+A9wFGIZw+thDAoZwt vFXSEF1jAg0jj47Wxe2ZLsgNnbgvqYtDAug113em9TsLxzUfdTZ3H+A8rgh9LmGE ORW3jlwGgApmIJm+ehlELdPSwyJwX90Lvc9ReOmDKwz1BMB6nXFg4vA4QcjS9oSG oRXUFSvfUV7wzDW5zhuRbM= Received: from asus-laptop (unknown [27.46.104.50]) by smtp1 (Coremail) with SMTP id GdxpCgAXSqSoUt1hn4VeFA--.10398S2; Tue, 11 Jan 2022 17:49:29 +0800 (CST) References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> <86lf1njad0.fsf@163.com> <86ilw4e6av.fsf@163.com> <87y23mheag.fsf_-_@gmail.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Oleg Pykhalov Subject: Re: bug#51747: [PATCH]: gnu: nix: Update to 2.4. Date: Tue, 11 Jan 2022 17:46:49 +0800 In-reply-to: <87y23mheag.fsf_-_@gmail.com> Message-ID: <86wnj6wqje.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: GdxpCgAXSqSoUt1hn4VeFA--.10398S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4RY9amUUUUU X-Originating-IP: [27.46.104.50] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiFAmFr1aD+2q1XgAAsY X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Oleg Pykhalov writes: > [[PGP Signed Part:Undecided]] > Hi, apologies for the slow response. Thanks for your review! Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [123.126.97.1 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (all_but_last[at]163.com) 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-Debbugs-Envelope-To: 51747 Cc: 51747@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Oleg Pykhalov writes: > [[PGP Signed Part:Undecided]] > Hi, apologies for the slow response. Thanks for your review! The problem is lowdown only provides a static archive.(compile without =2DfPIC). But nix tries to link with it. I see the build system of Lowdown on master now produce a shared library. But I haven't check whether they have a new release now. Anyway, I' ll update these patches later, move these code to label-less style and fix the compile error. =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYd1SpRUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/kf5gEA2diyg/wVDLxWJZ4/TRT1jzlnAeyK lvYT5V7OeFZIWiIA/1CHDwCWv8IRhe9nm0Fib/tTKTyeyAZJ624Dq+E3/JkH =gt/D -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 11 12:20:34 2022 Received: (at 51747) by debbugs.gnu.org; 11 Jan 2022 17:20:34 +0000 Received: from localhost ([127.0.0.1]:55415 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7Kor-0006rr-GJ for submit@debbugs.gnu.org; Tue, 11 Jan 2022 12:20:34 -0500 Received: from mail-m974.mail.163.com ([123.126.97.4]:45125) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7Kon-0006rS-U5 for 51747@debbugs.gnu.org; Tue, 11 Jan 2022 12:20:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=6mImY zEK8Nl2v/XVkn5JvKse969WZiFLb1R3EWeZBFM=; b=CI4rTEa7OrDbk2Ilh28pu DnMuJ5JnRdm2ZewYH3jj5ggKjPoYSiliePCr1t0y0hj82rjes6s+zvht19YmrHdG IaQU5Dtdw6GgzH04DYgT6QntJqiur47GczvibY3lD99I64XicsBPw45O5OHaG6A6 BppsTPML+L7HjyEbA/BNrc= Received: from asus-laptop (unknown [27.46.80.4]) by smtp4 (Coremail) with SMTP id HNxpCgDXvldKvN1hoDY+FA--.1357S2; Wed, 12 Jan 2022 01:20:11 +0800 (CST) References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> <86lf1njad0.fsf@163.com> <86ilw4e6av.fsf@163.com> <87y23mheag.fsf_-_@gmail.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Oleg Pykhalov Subject: Re: bug#51747: [PATCH]: gnu: nix: Update to 2.4. Date: Wed, 12 Jan 2022 01:19:06 +0800 In-reply-to: <87y23mheag.fsf_-_@gmail.com> Message-ID: <86pmoyrxyy.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: HNxpCgDXvldKvN1hoDY+FA--.1357S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjTE73sFUUUUU X-Originating-IP: [27.46.80.4] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBPQuFr2AY+dNU3gAAsE X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51747 Cc: 51747@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Patches updated. --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYd28RRUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/nnFgEAmbxAjtsbEUbfiq40wmhy/U8vL/06 ChK6G0+pc6jvv98A/11w6XcM949W/+7NHog3A0C5aCLSg6bP9Fzn6H1APhkK =xNmj -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-libcpuid.patch Content-Transfer-Encoding: quoted-printable >From 71bb95c5d9e446ecb7e395f21e6677bcba5c11e9 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 11 Jan 2022 22:56:14 +0800 Subject: [PATCH 1/5] gnu: Add libcpuid. * gnu/packages/hardware.scm (libcpuid): New variable. --- gnu/packages/hardware.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 8727f0f20a..a2708e6b90 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -9,6 +9,7 @@ ;;; Copyright =C2=A9 2021 Raghav Gururajan ;;; Copyright =C2=A9 2021 Vinicius Monego ;;; Copyright =C2=A9 2021, 2022 John Kehayias +;;; Copyright =C2=A9 2022 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -953,3 +954,22 @@ (define-public tpm2-tss libtss2-esys, libtss2-sys, libtss2-mu, libtss2-tcti-device, libtss2-tcti-s= wtpm and libtss2-tcti-mssim.") (license license:bsd-2))) + +(define-public libcpuid + (package + (name "libcpuid") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/anrieff/libcpuid/releases/d= ownload/v" + version "/libcpuid-" version ".tar.gz")) + (sha256 + (base32 "1nksdqk2w1c56lkrjcvh3nss9vq454j81j3yq14lwdn4x8bvmwfr")))) + (build-system gnu-build-system) + (supported-systems '("x86_64-linux" "i686-linux")) + (home-page "https://libcpuid.sourceforge.net/") + (synopsis "Small library for x86 CPU detection and feature extraction") + (description "Libcpuid is a small C library to get vendor, model, bran= ding +string, code name and other information from x86 CPU.") + (license license:bsd-2))) --=20 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-lowdown-Update-to-0.10.0-1-1de10c1.patch >From 0455cf022615c356eea487876b318774820270a7 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 11 Jan 2022 23:01:38 +0800 Subject: [PATCH 2/5] gnu: lowdown: Update to 0.10.0-1-1de10c1. * gnu/packages/markup.scm (lowdown): Update to 0.10.0-1-1de10c1. --- gnu/packages/markup.scm | 60 ++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 5f2f525cd2..563ad1e8e1 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -119,34 +119,40 @@ (define-public markdown "See License.text in the distribution.")))) (define-public lowdown - (package - (name "lowdown") - (version "0.10.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-" - version ".tar.gz")) - (sha256 - (base32 "15v2kk4ffqw3n6y6n9plch4qcib3ynnhw0ih8wn2v9qgn4jssp5p")))) - (build-system gnu-build-system) - (arguments - `(#:test-target "regress" - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "./configure" - (string-append "PREFIX=" out) - (string-append "MANDIR=" out "/share/man")))))))) - (native-inputs - (list which)) - (home-page "https://kristaps.bsd.lv/lowdown/") - (synopsis "Simple Markdown translator") - (description "Lowdown is a Markdown translator producing HTML5, + (let ((commit "1de10c1d71bfb4348ae0beaec8b1547d5e114969") + (revision "1")) + (package + (name "lowdown") + (version (git-version "0.10.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kristapsdz/lowdown") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1wh07nkiihvp1m79sj4qlnqklnn0rfp3hwls8sqcp0bfd96wpa1h")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "regress" + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "./configure" + (string-append "PREFIX=" out) + (string-append "MANDIR=" out "/share/man")))))) + #:make-flags '("CFLAGS=-fPIC")))) + + (native-inputs + (list which)) + (home-page "https://kristaps.bsd.lv/lowdown/") + (synopsis "Simple Markdown translator") + (description "Lowdown is a Markdown translator producing HTML5, roff documents in the ms and man formats, LaTeX, gemini, and terminal output.") - (license license:isc))) + (license license:isc)))) (define-public discount (package -- 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0003-gnu-lowdown-Use-G-expression.patch >From a62fb3b6a1b27ab0242ee61b6decba37959b008c Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 12 Jan 2022 00:52:25 +0800 Subject: [PATCH 3/5] gnu: lowdown: Use G-expression. * gnu/packages/markup.scm(lowdown)[arguments]: Convert to G-expression. --- gnu/packages/markup.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 563ad1e8e1..7a776b9101 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -29,6 +29,7 @@ (define-module (gnu packages markup) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) @@ -135,17 +136,16 @@ (define-public lowdown (base32 "1wh07nkiihvp1m79sj4qlnqklnn0rfp3hwls8sqcp0bfd96wpa1h")))) (build-system gnu-build-system) (arguments - `(#:test-target "regress" - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "./configure" - (string-append "PREFIX=" out) - (string-append "MANDIR=" out "/share/man")))))) - #:make-flags '("CFLAGS=-fPIC")))) - + (list + #:test-target "regress" + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda _ + (invoke "./configure" + (string-append "PREFIX=" #$output) + (string-append "MANDIR=" #$output "/share/man"))))) + #:make-flags #~(list "CFLAGS=-fPIC"))) (native-inputs (list which)) (home-page "https://kristaps.bsd.lv/lowdown/") -- 2.34.0 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0004-gnu-nix-Update-to-2.4.patch Content-Transfer-Encoding: quoted-printable >From 048c1a0fbc42d9aeb06e7f8b7f2b0d9fcbcb1e59 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 11 Jan 2022 23:10:01 +0800 Subject: [PATCH 4/5] gnu: nix: Update to 2.4. * gnu/packages/package-management.scm (nix): Update to 2.4. [source]: Switch to Github repository since upstream no longer provides tarball. [native-inputs]: Add autoconf, autoconf-archive, automake, bison, flex, gcc, googletest, jq, libtool. [inputs]: Add libarchive, libcpuid, lowdown, zlib. * gnu/packages/patches/nix-dont-build-html-doc.diff: New file. * gnu/local.mk(dist_patch_DATA): Add corresponding entry. --- gnu/local.mk | 1 + gnu/packages/package-management.scm | 66 +++++++++++++------ .../patches/nix-dont-build-html-doc.diff | 26 ++++++++ 3 files changed, 73 insertions(+), 20 deletions(-) create mode 100644 gnu/packages/patches/nix-dont-build-html-doc.diff diff --git a/gnu/local.mk b/gnu/local.mk index feadac4bad..9284212f01 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1515,6 +1515,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/nettle-3.5-check-_pkcs1_sec_decrypt-msg-len.patch \ %D%/packages/patches/nettle-3.5-CVE-2021-3580-pt1.patch \ %D%/packages/patches/nettle-3.5-CVE-2021-3580-pt2.patch \ + %D%/packages/patches/nix-dont-build-html-doc.diff \ %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/ngless-unliftio.patch \ diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-man= agement.scm index 8a4f5155ed..03f741dc2c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -20,6 +20,7 @@ ;;; Copyright =C2=A9 2021 Ivan Gankevich ;;; Copyright =C2=A9 2021 Maxim Cournoyer ;;; Copyright =C2=A9 2021 John Kehayias +;;; Copyright =C2=A9 2022 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -62,6 +63,8 @@ (define-module (gnu packages package-management) #:use-module (gnu packages dbm) #:use-module (gnu packages docbook) #:use-module (gnu packages file) + #:use-module (gnu packages flex) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -70,6 +73,7 @@ (define-module (gnu packages package-management) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) + #:use-module (gnu packages hardware) #:use-module (gnu packages hurd) #:use-module (gnu packages imagemagick) #:use-module (gnu packages less) @@ -77,6 +81,7 @@ (define-module (gnu packages package-management) #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages man) + #:use-module (gnu packages markup) #:use-module (gnu packages nettle) #:use-module (gnu packages networking) #:use-module (gnu packages ninja) @@ -657,14 +662,18 @@ (define-public guix-icons (define-public nix (package (name "nix") - (version "2.3.16") - (source (origin - (method url-fetch) - (uri (string-append "https://releases.nixos.org/nix/nix-" - version "/nix-" version ".tar.xz")) - (sha256 - (base32 - "1g5aqavr6i3c1xln53w1pdh1kvlxrpnknb105m4jbd85kyv83rky")))) + (version "2.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "http://github.com/NixOS/nix") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1abgfw5ndqklm0x533li32l4azifz3f6lhaxm6s74b704043r7m2")) + (patches + (search-patches "nix-dont-build-html-doc.diff")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--sysconfdir=3D/etc" "--enable-gc") @@ -680,18 +689,35 @@ (define-public nix (string-append "sysconfdir=3D" etc) (string-append "profiledir=3D" etc "/profile.d") make-flags))))))) - (native-inputs (list pkg-config)) - (inputs (list boost - brotli - bzip2 - curl - editline - libgc - libseccomp - libsodium - openssl - sqlite - xz)) + (native-inputs + (list autoconf + autoconf-archive + automake + bison + flex + googletest + jq + libtool + pkg-config)) + (inputs + (append (list boost + brotli + bzip2 + curl + editline + libarchive + libgc + libseccomp + libsodium + lowdown + openssl + sqlite + xz + zlib) + (if (or (target-x86-64?) + (target-x86-32?)) + (list libcpuid) + '()))) (home-page "https://nixos.org/nix/") (synopsis "The Nix package manager") (description diff --git a/gnu/packages/patches/nix-dont-build-html-doc.diff b/gnu/packag= es/patches/nix-dont-build-html-doc.diff new file mode 100644 index 0000000000..79142bc215 --- /dev/null +++ b/gnu/packages/patches/nix-dont-build-html-doc.diff @@ -0,0 +1,26 @@ +"--enable-doc-gen" configure flag will enable HTML document generation tha= t requires mdbook. +We can't simply disable it because we need manpages. + +Author: Zhu Zihao + +diff --git a/doc/manual/local.mk b/doc/manual/local.mk +index e43d9f2fb..c323d1847 100644 +--- a/doc/manual/local.mk ++++ b/doc/manual/local.mk +@@ -69,8 +69,6 @@ $(d)/builtins.json: $(bindir)/nix + $(trace-gen) $(dummy-env) NIX_PATH=3Dnix/corepkgs=3Dcorepkgs $(bindir)/n= ix __dump-builtins > $@.tmp + @mv $@.tmp $@ +=20 +-# Generate the HTML manual. +-install: $(docdir)/manual/index.html +=20 + # Generate 'nix' manpages. + install: $(mandir)/man1/nix3-manpages +@@ -94,7 +92,5 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/comman= d-ref/new-cli + done + @touch $@ +=20 +-$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/custom.cs= s $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/command-ref/con= f-file.md $(d)/src/expressions/builtins.md $(call rwildcard, $(d)/src, *.md) +- $(trace-gen) RUST_LOG=3Dwarn mdbook build doc/manual -d $(DESTDIR)$(docd= ir)/manual +=20 + endif --=20 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0005-gnu-nix-Use-G-expression.patch >From e442322866f6edd625ada09573afb7bff51f269e Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 12 Jan 2022 00:42:32 +0800 Subject: [PATCH 5/5] gnu: nix: Use G-expression. * gnu/packages/package-management.scm (nix)[arguments]: Convert to G-expression. --- gnu/packages/package-management.scm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 03f741dc2c..594d6e9d4b 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -676,19 +676,19 @@ (define-public nix (search-patches "nix-dont-build-html-doc.diff")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--sysconfdir=/etc" "--enable-gc") - #:phases - (modify-phases %standard-phases - (replace 'install - ;; Don't try & fail to create subdirectories in /etc, but keep them - ;; in the output as examples. - (lambda* (#:key (make-flags '()) outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (etc (string-append out "/etc"))) - (apply invoke "make" "install" - (string-append "sysconfdir=" etc) - (string-append "profiledir=" etc "/profile.d") - make-flags))))))) + (list + #:configure-flags #~(list "--sysconfdir=/etc" "--enable-gc") + #:phases + #~(modify-phases %standard-phases + (replace 'install + ;; Don't try & fail to create subdirectories in /etc, but keep them + ;; in the output as examples. + (lambda* (#:key (make-flags '()) outputs #:allow-other-keys) + (let ((etc (string-append #$output "/etc"))) + (apply invoke "make" "install" + (string-append "sysconfdir=" etc) + (string-append "profiledir=" etc "/profile.d") + make-flags))))))) (native-inputs (list autoconf autoconf-archive -- 2.34.0 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 11 14:04:28 2022 Received: (at 51747) by debbugs.gnu.org; 11 Jan 2022 19:04:28 +0000 Received: from localhost ([127.0.0.1]:55568 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7MRX-0005Hx-Na for submit@debbugs.gnu.org; Tue, 11 Jan 2022 14:04:27 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:57578) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7MRU-0005Hb-Rq for 51747@debbugs.gnu.org; Tue, 11 Jan 2022 14:04:26 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by michel.telenet-ops.be with bizsmtp id hX4P260044UW6Th06X4PJ4; Tue, 11 Jan 2022 20:04:23 +0100 Message-ID: <190ec030edbca1c16fb030c51acd60ffc6bae269.camel@telenet.be> Subject: Re: [bug#51747] [PATCH]: gnu: nix: Update to 2.4. From: Maxime Devos To: Zhu Zihao , Oleg Pykhalov Date: Tue, 11 Jan 2022 20:04:17 +0100 In-Reply-To: <86pmoyrxyy.fsf@163.com> References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> <86lf1njad0.fsf@163.com> <86ilw4e6av.fsf@163.com> <87y23mheag.fsf_-_@gmail.com> <86pmoyrxyy.fsf@163.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-cozd9Zl5E3YJx2rA9jf8" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1641927863; bh=xov8QhskcaltV53Y2FL+sWFvf+jLbBELx5pQJlzreh0=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=do5/nfznO2WETZp0DTsF4xh2U4lyE3Wz2+taPXnsIdtlQaJjqAGLDoNCyCKJwJdSS yoO29NlEbtjRGt849OIIS3D37typRRm7vkA58TA8x55H4ubOC32yxoO6pxeY0Nmakw o/Kmg88Urcyr/Xizt1VtqE9HcQUpm0s0O/S2kaj7KIrEOgBZDNxBDu1gYn+f1nE1BD DOFQ173YUaGYtchqRKR/hQeQIwSKKUGTUnOJ8DcLSMVi1zXPXE6/0X4rd8kKTgg76n Oj8G2u3qeuDG4ypyRt8G5NMk571tZ4hC2Qw2Qar93NtTuSc2lx1spufyMnJTmhGqqE XY8t6PstnjURQ== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 51747 Cc: 51747@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-cozd9Zl5E3YJx2rA9jf8 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Zhu Zihao schreef op wo 12-01-2022 om 01:19 [+0800]: > + (name "libcpuid") [...] > +=C2=A0=C2=A0=C2=A0 (supported-systems '("x86_64-linux" "i686-linux")) Given that 'cpuid' is a CPU instruction, I don't think this is Linux-specific; presumably it works on the Hurd as well. =C2=A0According to the README, it also supports some BSDs, Mac OS and Windows! Could you change it to (filter (lambda (t) (or (x86-64-target? t) (or (x86-32-target? t)))) %supported-systems) instead (untested)? Also, the source code contains a blob , could you remove it in an origin snippet? There might be more blobs, I didn't look at all files. Greetings, Maxime. --=-cozd9Zl5E3YJx2rA9jf8 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYd3UsRccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7lbpAQCpG26I1bwUpiq7Ji/mhLq3y6Pq t+XwrUt1CCU0c3cOBAD+N4rGYW/pTR28yXxnMMapOTCVpPNvC3bD73PUPv2wVgQ= =si4g -----END PGP SIGNATURE----- --=-cozd9Zl5E3YJx2rA9jf8-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 11 14:05:29 2022 Received: (at 51747) by debbugs.gnu.org; 11 Jan 2022 19:05:29 +0000 Received: from localhost ([127.0.0.1]:55581 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7MSW-0005M4-RP for submit@debbugs.gnu.org; Tue, 11 Jan 2022 14:05:29 -0500 Received: from albert.telenet-ops.be ([195.130.137.90]:45052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7MSV-0005Ls-EV for 51747@debbugs.gnu.org; Tue, 11 Jan 2022 14:05:27 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by albert.telenet-ops.be with bizsmtp id hX5S260034UW6Th06X5SFA; Tue, 11 Jan 2022 20:05:26 +0100 Message-ID: Subject: Re: [bug#51747] [PATCH]: gnu: nix: Update to 2.4. From: Maxime Devos To: Zhu Zihao , Oleg Pykhalov Date: Tue, 11 Jan 2022 20:05:25 +0100 In-Reply-To: <86pmoyrxyy.fsf@163.com> References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> <86lf1njad0.fsf@163.com> <86ilw4e6av.fsf@163.com> <87y23mheag.fsf_-_@gmail.com> <86pmoyrxyy.fsf@163.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-YoOa5PZHeG0G5C/ezS8F" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1641927926; bh=+6Lk1fHOMV3797T8CS0w8i+lgFoQCtZrYCe87LphUEI=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=eE80wLdXMcvkyAp9HhmnZY4xT+JApXft+remtV2+ZUleIDWPPuHwjcDd5OQntAqEb jdjx/Pq7YK5+mLLZ+w+jLGxMi0bmq3OHSwIGveshD6wmMZ3qLxix5U2+LoD/TJfnzm UvSFQArFH6RvjV8fuKCOdZiszxLUsh+/awtfNBEvvGo7Bo22I/AcEEUnhUCQQSgZ8H YF58/hIfLFPf64I+v/IdUHPXAuOq++A328j7Rq2Z19e5QzsTCjcvMaPlHyd1ZG9hxb +xB5OB6r0BhNXrXu8UD2EANWj7rMpdUx3B9N3OjICyMghXAUEGTlMCx4eae43JoB79 4lXdGC+pEzFbA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 51747 Cc: 51747@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-YoOa5PZHeG0G5C/ezS8F Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Another two blobs: --=-YoOa5PZHeG0G5C/ezS8F Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYd3U9RccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7tq9AP40+BKfyO80z2ZB463q1b5GvkmG /0bm/33jz0UJqTzuaQEA43iR40kQV9+6a8TO5YeypAJYcRWJ68gSi+uy7SoG/Qw= =iEMs -----END PGP SIGNATURE----- --=-YoOa5PZHeG0G5C/ezS8F-- From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 11 23:27:04 2022 Received: (at 51747) by debbugs.gnu.org; 12 Jan 2022 04:27:05 +0000 Received: from localhost ([127.0.0.1]:55967 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7VE0-0000RD-Mt for submit@debbugs.gnu.org; Tue, 11 Jan 2022 23:27:04 -0500 Received: from mail-m974.mail.163.com ([123.126.97.4]:29756) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7VDw-0000QV-Qi for 51747@debbugs.gnu.org; Tue, 11 Jan 2022 23:27:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=8zMmi 3nJmfulfO3L4/9glS/groHhVbqg7GXPpR5sIrA=; b=XBeFLkNxOkSE+3/wYtI2e EiSuAaUBpOORY+gOBQKvJ+cSk951GvCbxbSbbUP/TtWtbUCY+490tVeboPUlcqi8 pM8v9DQlMLwBp4GcLHg+gmqbM3vcmZoewPeQCdJacwNWPQjGv/ho8ACaQFQQBVsV e7OQbilYTf/bvwOHwkgDgI= Received: from asus-laptop (unknown [27.46.80.3]) by smtp4 (Coremail) with SMTP id HNxpCgA3qkuKWN5hk2F+FA--.1055S2; Wed, 12 Jan 2022 12:26:51 +0800 (CST) References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> <86lf1njad0.fsf@163.com> <86ilw4e6av.fsf@163.com> <87y23mheag.fsf_-_@gmail.com> <86pmoyrxyy.fsf@163.com> <190ec030edbca1c16fb030c51acd60ffc6bae269.camel@telenet.be> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Maxime Devos Subject: Re: [bug#51747] [PATCH]: gnu: nix: Update to 2.4. Date: Wed, 12 Jan 2022 12:21:47 +0800 In-reply-to: <190ec030edbca1c16fb030c51acd60ffc6bae269.camel@telenet.be> Message-ID: <8635lto9z3.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: HNxpCgA3qkuKWN5hk2F+FA--.1055S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7Ww4DtrWDCFWxGFWxGw1Utrb_yoW8Xr4kpw 4xJFyqyrs8Xr4Ikrsak3WayFWfZwn3Z3sIgFy5tr95urs8tFyxKr4Fkw4qkasxZrs29w1j vF4qyryvgFW2kFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zEdgAcUUUUU= X-Originating-IP: [27.46.80.3] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBLwuGr1UMPqXheAAAsW X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51747 Cc: Oleg Pykhalov , 51747@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Maxime Devos writes: > [[PGP Signed Part:Undecided]] > Zhu Zihao schreef op wo 12-01-2022 om 01:19 [+0800]: >> + (name "libcpuid") [...] >> +=C2=A0=C2=A0=C2=A0 (supported-systems '("x86_64-linux" "i686-linux")) > > Given that 'cpuid' is a CPU instruction, I don't think > this is Linux-specific; presumably it works on the Hurd > as well. =C2=A0According to the README, it also supports some BSDs, > Mac OS and Windows! > > Could you change it to > > (filter (lambda (t) (or (x86-64-target? t) (or (x86-32-target? t)))) > %supported-systems) > > instead (untested)? > > Also, the source code contains a blob > , > could you remove it in an origin snippet? > > There might be more blobs, I didn't look at all files. > > Greetings, > Maxime. > > [[End of PGP Signed Part]] Interesting, It looks that these blobs are for Windows system. I don't care about MS Windows, but blobs are tightly integrated in the source. The source reports that they're compiled from the source in contrib/MSR Driver/Kernel. They're PE COFF format, If we want to compile it ourself, we have to use mingw cross compiler. This increase the complexity of build script. AFAIK, nix use libcpuid only in linux context. My idea is replace these blobs with empty bytes. Maybe leave a note for who want mingw cross build.= =20 =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYd5YgBUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/nLOgD8DnCTU7XPupgij02SnBBpLP4TzErg /OLR9nlEMfSQlGUBAOCoZ7D8pmpg4+T+iOR1pXRNDtu9nSuSmJaYQ5Xs2ZQM =qq0U -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 12 00:19:50 2022 Received: (at 51747) by debbugs.gnu.org; 12 Jan 2022 05:19:51 +0000 Received: from localhost ([127.0.0.1]:56033 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7W34-0002R0-PL for submit@debbugs.gnu.org; Wed, 12 Jan 2022 00:19:50 -0500 Received: from mail-lf1-f52.google.com ([209.85.167.52]:40483) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7W31-0002Qh-N3 for 51747@debbugs.gnu.org; Wed, 12 Jan 2022 00:19:49 -0500 Received: by mail-lf1-f52.google.com with SMTP id s30so4091129lfo.7 for <51747@debbugs.gnu.org>; Tue, 11 Jan 2022 21:19:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=mEl0tseaRaEiZOR8r12Dp3d4Q2m5LRGeprNyuAjn04U=; b=bMtncBKV99SvAVmKCwEY99GwD78KSyPtQdAYzy4L1vGdH/TtAKmnof+7j+hiW0vNjN xS6uiYjo9SiunrAP6LmNjTGl+kSFTtDADubcDJCom2apSmp5S2qFn/rXEFrwsAfTfBIh cj8ctQU5TuXAr4nyUo4XTuy//JXYPHFpdjsaGZnTxwxAGZQVDr3K+2fhcCltbe+VgZlT KLVFjWPR2Fm7VNod0NwRMSYf2dSBo7k68NEs3TNlkp2LUOVijBAQNyZwC66fvRF0tQvn MUjSChr9dQoJtLBKnlZJN5PIuWiIC8+gk6n0FOD8Du6ZwFst5Qt4n2UvQSyWgNZMaUov fpBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=mEl0tseaRaEiZOR8r12Dp3d4Q2m5LRGeprNyuAjn04U=; b=RgV4x8sBtsKep6MNJzDJBWw4jZ8Kwwfyfpc12rKDrWhXvlWsa0qVd5eKn3bRZd7j1Z blJdFZdih5eBWoD0J24POUWhw6EBZAZ8a/kgPi8pYo2mL8+nMr8CN1Wl3eSQ2rFqzWmF a6iCZkaFEeVbo07JA/nne3H6Q2pW230Gt/U6YAnjfBSn9BtcMcC/iLSopAVa8mmESSRw f5ChN/GxVw3d3Vl9WkjBRwP8w8UKFCtfisQRD1AihS0DgYBQ5amsS6hTQ53S7qSxGnR3 AaZprMqDKTdTSF9hQ7xYzyKmS/XUIGoFZh4Eaj0PNfnCPj5N5dZGWZsXW8tt6dDXvpUR kMLQ== X-Gm-Message-State: AOAM531SL6Bacczde2MtqtX9KVVggf4XwwcO5TXmBRIFERzVmWJkov1I GEWlldfvk2fdmAtwjZK5f74bz1zo+Rk= X-Google-Smtp-Source: ABdhPJy2TbMc+IeKoyINamHCJr3HN5PUpA6sgXkSfUgQc0ctIT2IR1CAczMzDCm0HbpcaefilWpJ2Q== X-Received: by 2002:a05:6512:3c92:: with SMTP id h18mr3568837lfv.432.1641964781289; Tue, 11 Jan 2022 21:19:41 -0800 (PST) Received: from guixsd ([88.201.161.72]) by smtp.gmail.com with ESMTPSA id j6sm670056lfe.55.2022.01.11.21.19.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jan 2022 21:19:40 -0800 (PST) From: Oleg Pykhalov To: Zhu Zihao Subject: Re: [bug#51747] [PATCH]: gnu: nix: Update to 2.4. References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> <86lf1njad0.fsf@163.com> <86ilw4e6av.fsf@163.com> <87y23mheag.fsf_-_@gmail.com> <86pmoyrxyy.fsf@163.com> <190ec030edbca1c16fb030c51acd60ffc6bae269.camel@telenet.be> <8635lto9z3.fsf@163.com> Date: Wed, 12 Jan 2022 08:19:37 +0300 In-Reply-To: <8635lto9z3.fsf@163.com> (Zhu Zihao's message of "Wed, 12 Jan 2022 12:21:47 +0800") Message-ID: <87wnj57cpi.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51747 Cc: 51747@debbugs.gnu.org, Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Zhu Zihao writes: [=E2=80=A6] > Interesting, It looks that these blobs are for Windows system. I don't > care about MS Windows, but blobs are tightly integrated in the source. > > The source reports that they're compiled from the source in contrib/MSR > Driver/Kernel. They're PE COFF format, If we want to compile it ourself, > we have to use mingw cross compiler. This increase the complexity of > build script. > > AFAIK, nix use libcpuid only in linux context. My idea is replace these > blobs with empty bytes. Maybe leave a note for who want mingw cross build= .=20 Does the current version 2.5.1 https://nixos.org/download.html contains those blobs? And in any case, could we update to 2.5.1 instead of 2.4? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJIBAEBCgAyFiEEcjhxI46s62NFSFhXFn+OpQAa+pwFAmHeZOkUHGdvLndpZ3Vz dEBnbWFpbC5jb20ACgkQFn+OpQAa+pwa5g/+M+QGxXXlakzHDl8Cb+CYVpcNOi0M 8qBp14w4zqixBcGPQGjJRYHcTQfdSgR0eGv863dFYrDIOCdB+yOtxoRArzo84uEw 8R0cfIUJR3ECLVyRmwnyNzHzuOulO3bsBntCZwPXLQDUVG90o2SXlcvK5PTWd47b 7TqfjzkvnQNFp2/3UiehfJL64f4OtXeQLUqBxAZ35oeb0cH4ZArIyzxvgjzmZNHN 0ZtJfvu001y29QlLW0Q3/VlclOLAf7S0khWumKhxoCBxAlvHj7cMcA3liHKbKJSX WSsMoJX2IGa48k/iCSfqI75FnDUo0Pv/d80FjbU91y6JlmEysHo+7EC1lY8Z5/ig sWD7Zlf9HgZ40RXvXJVjIQ9BUuwhVrMjnwG00zcjWRBRT/lPW6r7pl3gWS/Zv9D1 oZQRkstH+Q2SwqVyLYOSiy2UX2MtW7DvfMxPAC8C+nxy6AjSlVJEJT4fjPaLxizy RfQYrs9C58BZubXb3J83tbfON4Pj2Cyg9aODnMP1GROZYk6WuyU2if89+q4UUOek oiQgq5HpWqQqABEkCeZbYrO1lfCQ+Gt709uisB9WXdw6cvpAFjwcbPb9ls0s9wcu rxIsiqyXNNOLqm0YK0hw4UBZiDbrWv0abLUgufafsNZqic5eG4gQP4yJq63K0ruC Bz60MrgL3GrgvXM= =yaQB -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 12 02:10:16 2022 Received: (at 51747) by debbugs.gnu.org; 12 Jan 2022 07:10:16 +0000 Received: from localhost ([127.0.0.1]:56123 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7Xlv-0000R3-Oa for submit@debbugs.gnu.org; Wed, 12 Jan 2022 02:10:16 -0500 Received: from mail-m973.mail.163.com ([123.126.97.3]:60785) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7Xlq-0000QO-Ju for 51747@debbugs.gnu.org; Wed, 12 Jan 2022 02:10:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=/rpyL 9Aae3wpL2UcG/eNCuTIrf2zHhck1S3GUlAvFWA=; b=W2bh0Mi8vFZtOKeNYQ/z5 snJuXkT4e+U506DSk4fWqEha29gLnY3gvLf3Bs72BdpuJCo8xJglandlYc6Pczky 7cap+UDGi5rPOAjXH+9vBcaOdQlzDD63GTC+y6B6AJuTnFUmZiJiTMOvGxQHokKb uSGddFhgJXctvAT3VIyfng= Received: from asus-laptop (unknown [163.125.202.5]) by smtp3 (Coremail) with SMTP id G9xpCgC3k+nHft5hHm+1FA--.4650S2; Wed, 12 Jan 2022 15:10:00 +0800 (CST) References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> <86lf1njad0.fsf@163.com> <86ilw4e6av.fsf@163.com> <87y23mheag.fsf_-_@gmail.com> <86pmoyrxyy.fsf@163.com> <190ec030edbca1c16fb030c51acd60ffc6bae269.camel@telenet.be> <8635lto9z3.fsf@163.com> <87wnj57cpi.fsf@gmail.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Oleg Pykhalov Subject: Re: [bug#51747] [PATCH]: gnu: nix: Update to 2.4. Date: Wed, 12 Jan 2022 15:08:12 +0800 In-reply-to: <87wnj57cpi.fsf@gmail.com> Message-ID: <86bl0hmnvi.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: G9xpCgC3k+nHft5hHm+1FA--.4650S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7Wr17tr18Kw1kKFyrXrWUurg_yoWkXFc_Wr 4q9rs3G398tr4xGw42yrZ2kFWaqay5AFykGa4kArWfuryqgFsxWas7uw1fArWjgFs3JryD u3Z5X3sY93s0vjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7xRtCzt7UUUUU== X-Originating-IP: [163.125.202.5] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBLwiGr1UMPqfyHAAAsg X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51747 Cc: 51747@debbugs.gnu.org, Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Oleg Pykhalov writes: > [[PGP Signed Part:Undecided]] > Zhu Zihao writes: > > [=E2=80=A6] > >> Interesting, It looks that these blobs are for Windows system. I don't >> care about MS Windows, but blobs are tightly integrated in the source. >> >> The source reports that they're compiled from the source in contrib/MSR >> Driver/Kernel. They're PE COFF format, If we want to compile it ourself, >> we have to use mingw cross compiler. This increase the complexity of >> build script. >> >> AFAIK, nix use libcpuid only in linux context. My idea is replace these >> blobs with empty bytes. Maybe leave a note for who want mingw cross buil= d.=20 > > Does the current version 2.5.1 https://nixos.org/download.html contains > those blobs? > > And in any case, could we update to 2.5.1 instead of 2.4? > > [[End of PGP Signed Part]] Thank you for remind me the release of 2.5.1. We should update to 2.5.1 But the blob is contained in libcpuid, Nix 2.5.1 still use libcpuid for x86 machine. =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYd5+oRUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/nchQEA9WqHeRahDM/vT5YFL2c/Qzw2Fgcr yk4gOplKotcXdKoBAPUBTEfVh8KZiiYP6fx1saQ1M0J+BNcu4ZVyD7f1D7wL =wc8s -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 12 03:26:11 2022 Received: (at 51747) by debbugs.gnu.org; 12 Jan 2022 08:26:12 +0000 Received: from localhost ([127.0.0.1]:56210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7YxP-00033c-Ov for submit@debbugs.gnu.org; Wed, 12 Jan 2022 03:26:11 -0500 Received: from michel.telenet-ops.be ([195.130.137.88]:55810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7YxL-00033G-0c for 51747@debbugs.gnu.org; Wed, 12 Jan 2022 03:26:10 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by michel.telenet-ops.be with bizsmtp id hkS5260064UW6Th06kS5Po; Wed, 12 Jan 2022 09:26:05 +0100 Message-ID: Subject: Re: [bug#51747] [PATCH]: gnu: nix: Update to 2.4. From: Maxime Devos To: Zhu Zihao Date: Wed, 12 Jan 2022 08:26:00 +0000 In-Reply-To: <8635lto9z3.fsf@163.com> References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> <86lf1njad0.fsf@163.com> <86ilw4e6av.fsf@163.com> <87y23mheag.fsf_-_@gmail.com> <86pmoyrxyy.fsf@163.com> <190ec030edbca1c16fb030c51acd60ffc6bae269.camel@telenet.be> <8635lto9z3.fsf@163.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-SOGxJkp+4XQ+g4qfy2KE" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1641975965; bh=y2q276ojhN3byUA5lkzvC5NuM39JMyHRcYMmYz099sI=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=OF6Dbkvih/liO54vXNmC9d+4iPYPMTU3BEeHYmtTo1LEN87NYuVRuDRUTGlpqqeVj igLd0WOYTyqvUmxBSxouBGbcnEC+qk2ttd4+Fq2SrDaYAZfBF05bTgV61bBW2vfIC+ k1ndz4//kYGY0aQ6hHrboKuKDwz1Ske4dHB5oF0g0KhxFoWDRTnTtyOEMNlMZwct1n UrHCrNJ/4O3YZEuPf4KXu8hz5TSOhABc0M2a8ASu4CMHE2qon/OM33YjlSWcfMFpkv amVlyL/2DHqcGZTQAGP8AMZKsKk0VQ8ok5WFowHKnE4I4Xr0JFhhetXjUbkZO2UXgp mg0GKJgznH1mw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 51747 Cc: Oleg Pykhalov , 51747@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-SOGxJkp+4XQ+g4qfy2KE Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Zhu Zihao schreef op wo 12-01-2022 om 12:21 [+0800]: > [ > ...] > Interesting, It looks that these blobs are for Windows system. I don't > care about MS Windows, but blobs are tightly integrated in the source. >=20 > The source reports that they're compiled from the source in contrib/MSR > Driver/Kernel. They're PE COFF format, If we want to compile it ourself, > we have to use mingw cross compiler. This increase the complexity of > build script. >=20 > AFAIK, nix use libcpuid only in linux context. My idea is replace these > blobs with empty bytes. Maybe leave a note for who want mingw cross build= .=20 Often (but not always, cf. rust), when software has files for specific architectures or operating systems, they will only be compiled if they match the architecture and operating system the software is compiled for. As such, there's a good chance the build will succeed (at least for Linux, for Hurd, ...) if they are simply deleted. Greetings, Maxime. --=-SOGxJkp+4XQ+g4qfy2KE Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYd6QmBccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7rkiAQDmhdqJZaT2Bs0NTYpfFqC4Qhv/ 6moqKTwdErhf41mHIAD/TB80KqSkj2gQP1sFxz9fXVKlB48iEG2zEZfwcAzthQM= =zf22 -----END PGP SIGNATURE----- --=-SOGxJkp+4XQ+g4qfy2KE-- From debbugs-submit-bounces@debbugs.gnu.org Wed Jan 12 23:57:44 2022 Received: (at 51747) by debbugs.gnu.org; 13 Jan 2022 04:57:44 +0000 Received: from localhost ([127.0.0.1]:59689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7sBD-0007K7-R5 for submit@debbugs.gnu.org; Wed, 12 Jan 2022 23:57:44 -0500 Received: from mail-m971.mail.163.com ([123.126.97.1]:40288) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7sB7-0007Jf-0K for 51747@debbugs.gnu.org; Wed, 12 Jan 2022 23:57:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=BDxtc J4OTYpLD9ZnoFVytyXcuvgK820pwU51YMSW6w0=; b=cL8jAXF6uxXBiiP7GPqXp kwxsFbEsa+CUiZr9GCOXe0eJYktHYoXmKEdkEkTY83+WNCw4YpsOILzXM33gND6e 5Llf7MjViJ+7BbgsH2XGZLE4UxIcHjJ+56eJwvlDFDGQ3Pow9VxNPIUM8riuJZei UHDjEtjdOWVhU1o+BIEZUI= Received: from asus-laptop (unknown [27.46.104.39]) by smtp1 (Coremail) with SMTP id GdxpCgC3Ihczsd9hos5MFQ--.13950S2; Thu, 13 Jan 2022 12:57:25 +0800 (CST) References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> <86lf1njad0.fsf@163.com> <86ilw4e6av.fsf@163.com> <87y23mheag.fsf_-_@gmail.com> <86pmoyrxyy.fsf@163.com> <190ec030edbca1c16fb030c51acd60ffc6bae269.camel@telenet.be> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Maxime Devos Subject: Re: [bug#51747] [PATCH]: gnu: nix: Update to 2.4. Date: Thu, 13 Jan 2022 12:54:07 +0800 In-reply-to: <190ec030edbca1c16fb030c51acd60ffc6bae269.camel@telenet.be> Message-ID: <86zgo0nsgf.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: GdxpCgC3Ihczsd9hos5MFQ--.13950S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4EJ39SUUUUU X-Originating-IP: [27.46.104.39] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBaxWHr1et2xAsKQAAsi X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51747 Cc: Oleg Pykhalov , 51747@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Maxime Devos writes: > Could you change it to > > (filter (lambda (t) (or (x86-64-target? t) (or (x86-32-target? t)))) > %supported-systems) I found that it actually only supports Linux & Windows. There're only code stubs for other platform. I've created a patch to libcpuid, make it only link with msrdriver.c on Windows platform. See https://github.com/anrieff/libcpuid/pull/159. =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYd+xMBUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/n7SAD/dv2fEXmngU59jGQZGTsQV8Z+Gk19 RLkcShNEJl9uKc0A/Rfan6iConfWfXqrof3apCKBRwLftcJv4Da4SABsjAEI =tMT1 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 13 02:55:58 2022 Received: (at 51747) by debbugs.gnu.org; 13 Jan 2022 07:55:58 +0000 Received: from localhost ([127.0.0.1]:60009 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7uxi-0004oe-2F for submit@debbugs.gnu.org; Thu, 13 Jan 2022 02:55:58 -0500 Received: from mail-m972.mail.163.com ([123.126.97.2]:51867) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7uxe-0004oJ-1T for 51747@debbugs.gnu.org; Thu, 13 Jan 2022 02:55:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=XnwH7 MTt4FG6e3vAoXUaHXgGQWRrb9+AoJtEPFFBHW4=; b=GmtFjpgETWtfCB4V88Fd7 VXzZ63ieD96yoLbmNZTdoDv/90lNkRqhuR+gZFw5wg9TdLdcEq71MOffaDCyxQrt KFTC9bkyfgOgWsSomwOqIHsSTrzTr1Q82hf98prB9uP/sSfRs2uYUWvYhVxL5p4R IRkkveQUXY8RaCYJn+eOAc= Received: from asus-laptop (unknown [112.95.112.205]) by smtp2 (Coremail) with SMTP id GtxpCgAXgeH+2t9hkdnYQg--.6241S2; Thu, 13 Jan 2022 15:55:43 +0800 (CST) References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> <86lf1njad0.fsf@163.com> <86ilw4e6av.fsf@163.com> <87y23mheag.fsf_-_@gmail.com> <86pmoyrxyy.fsf@163.com> <190ec030edbca1c16fb030c51acd60ffc6bae269.camel@telenet.be> <86zgo0nsgf.fsf@163.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Maxime Devos Subject: Re: [bug#51747] [PATCH]: gnu: nix: Update to 2.4. Date: Thu, 13 Jan 2022 15:54:51 +0800 In-reply-to: <86zgo0nsgf.fsf@163.com> Message-ID: <86bl0g6pec.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: GtxpCgAXgeH+2t9hkdnYQg--.6241S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4R_YFCUUUUU X-Originating-IP: [112.95.112.205] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBLxCHr1UMPrkBjgACsE X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51747 Cc: Oleg Pykhalov , 51747@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Zhu Zihao writes: > I found that it actually only supports Linux & Windows. There're only > code stubs for other platform. Correction, the MSR detection is limited to Linux & Windows, while other functionalities are not. =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYd/a6xUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/kP9wD/dXUQ8aeLXP/rWLM8WLqbHeRXf5x/ PJTbysTkrepZ6dsBALPPHn22g+r8lgR/hjHb85H9hBhAI18/YZi73lNbcwQG =Vq+/ -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 14 04:33:36 2022 Received: (at 51747) by debbugs.gnu.org; 14 Jan 2022 09:33:37 +0000 Received: from localhost ([127.0.0.1]:35633 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8Ixc-00013M-Iz for submit@debbugs.gnu.org; Fri, 14 Jan 2022 04:33:36 -0500 Received: from mail-m972.mail.163.com ([123.126.97.2]:60404) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8IxY-00012y-D3 for 51747@debbugs.gnu.org; Fri, 14 Jan 2022 04:33:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=GQ9e6 tIwjnW0FdX37VjvRSEPKs6iFxIBboVr2bXVeB4=; b=CkT0xg2/lrtOXttCqyYjO MxT0kOiFZd53Kifcz+AVby7YhJ6YgMBz/2MMVONu9ity2fiPL9B6QZxJsu0gNh+F 7ZLz/UQQrWQrQ8vva0zQmd4Op7KO9ygDiBHDb4pgrL+SIOJ21J93qhaZiJsvzRLl +3cBXcWtTyhPNEF6VvCSh0= Received: from asus-laptop (unknown [27.38.202.2]) by smtp2 (Coremail) with SMTP id GtxpCgBXW5FYQ+Fh6jw2AA--.8614S2; Fri, 14 Jan 2022 17:33:12 +0800 (CST) References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> <86lf1njad0.fsf@163.com> <86ilw4e6av.fsf@163.com> <87y23mheag.fsf_-_@gmail.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Oleg Pykhalov Subject: Re: bug#51747: [PATCH]: gnu: nix: Update to 2.4. Date: Fri, 14 Jan 2022 17:31:46 +0800 In-reply-to: <87y23mheag.fsf_-_@gmail.com> Message-ID: <86h7a664rv.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: GtxpCgBXW5FYQ+Fh6jw2AA--.8614S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4R5Ef2UUUUU X-Originating-IP: [27.38.202.2] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBZhmIr1aD+xGMMgAAsZ X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51747 Cc: 51747@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Finally solve these issues, I hope. --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYeFDVBUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/m0pgD+PbesFeUvXFqLjefeI0V+D8ztS1NM l6s3fM6wddfkRyEA/37ZA8vVocZkBwGE3C04JWaBglgXQauHZuX06JLyZJIL =fM9J -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-libcpuid.patch Content-Transfer-Encoding: quoted-printable >From 7ac9e6dd9d327c59d6d90dc0628a65fe26946021 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 11 Jan 2022 22:56:14 +0800 Subject: [PATCH 1/6] gnu: Add libcpuid. * gnu/packages/hardware.scm (libcpuid): New variable. --- gnu/packages/hardware.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 8727f0f20a..230800e44d 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -9,6 +9,7 @@ ;;; Copyright =C2=A9 2021 Raghav Gururajan ;;; Copyright =C2=A9 2021 Vinicius Monego ;;; Copyright =C2=A9 2021, 2022 John Kehayias +;;; Copyright =C2=A9 2022 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -953,3 +954,34 @@ (define-public tpm2-tss libtss2-esys, libtss2-sys, libtss2-mu, libtss2-tcti-device, libtss2-tcti-s= wtpm and libtss2-tcti-mssim.") (license license:bsd-2))) + +(define-public libcpuid + (let ((commit "2e61160983f32ba840b2246d3c3850c44626ab0d") + (revision "1")) + (package + (name "libcpuid") + (version (git-version "0.5.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/anrieff/libcpuid") + (commit commit))) + (sha256 + (base32 "1mphvkiqq6z33sq6i490fq27sbyylacwrf8bg7ccvpcjms208sww")) + (modules '((guix build utils))) + (snippet + ;; Remove blobs + #~(begin + (delete-file "libcpuid/msrdriver.c") + (delete-file-recursively "contrib/MSR Driver"))) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + (list #:tests? #f)) ;broken + (supported-systems '("x86_64-linux" "i686-linux")) + (home-page "https://libcpuid.sourceforge.net/") + (synopsis "Small library for x86 CPU detection and feature extractio= n") + (description "Libcpuid is a small C library to get vendor, model, br= anding +string, code name and other information from x86 CPU.") + (license license:bsd-2)))) --=20 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-lowdown-Update-to-0.10.0-1-1de10c1.patch >From cd5285dabf027faca80c84ba2e656cd77d06ef98 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 11 Jan 2022 23:01:38 +0800 Subject: [PATCH 2/6] gnu: lowdown: Update to 0.10.0-1-1de10c1. * gnu/packages/markup.scm (lowdown): Update to 0.10.0-1-1de10c1. --- gnu/packages/markup.scm | 60 ++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 5f2f525cd2..563ad1e8e1 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -119,34 +119,40 @@ (define-public markdown "See License.text in the distribution.")))) (define-public lowdown - (package - (name "lowdown") - (version "0.10.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-" - version ".tar.gz")) - (sha256 - (base32 "15v2kk4ffqw3n6y6n9plch4qcib3ynnhw0ih8wn2v9qgn4jssp5p")))) - (build-system gnu-build-system) - (arguments - `(#:test-target "regress" - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "./configure" - (string-append "PREFIX=" out) - (string-append "MANDIR=" out "/share/man")))))))) - (native-inputs - (list which)) - (home-page "https://kristaps.bsd.lv/lowdown/") - (synopsis "Simple Markdown translator") - (description "Lowdown is a Markdown translator producing HTML5, + (let ((commit "1de10c1d71bfb4348ae0beaec8b1547d5e114969") + (revision "1")) + (package + (name "lowdown") + (version (git-version "0.10.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kristapsdz/lowdown") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1wh07nkiihvp1m79sj4qlnqklnn0rfp3hwls8sqcp0bfd96wpa1h")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "regress" + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "./configure" + (string-append "PREFIX=" out) + (string-append "MANDIR=" out "/share/man")))))) + #:make-flags '("CFLAGS=-fPIC")))) + + (native-inputs + (list which)) + (home-page "https://kristaps.bsd.lv/lowdown/") + (synopsis "Simple Markdown translator") + (description "Lowdown is a Markdown translator producing HTML5, roff documents in the ms and man formats, LaTeX, gemini, and terminal output.") - (license license:isc))) + (license license:isc)))) (define-public discount (package -- 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0003-gnu-lowdown-Use-G-expression.patch >From fd2849039d8df0831f2f5e55701f6e7ddf8ea0fe Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 12 Jan 2022 00:52:25 +0800 Subject: [PATCH 3/6] gnu: lowdown: Use G-expression. * gnu/packages/markup.scm(lowdown)[arguments]: Convert to G-expression. --- gnu/packages/markup.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 563ad1e8e1..7a776b9101 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -29,6 +29,7 @@ (define-module (gnu packages markup) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) @@ -135,17 +136,16 @@ (define-public lowdown (base32 "1wh07nkiihvp1m79sj4qlnqklnn0rfp3hwls8sqcp0bfd96wpa1h")))) (build-system gnu-build-system) (arguments - `(#:test-target "regress" - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "./configure" - (string-append "PREFIX=" out) - (string-append "MANDIR=" out "/share/man")))))) - #:make-flags '("CFLAGS=-fPIC")))) - + (list + #:test-target "regress" + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda _ + (invoke "./configure" + (string-append "PREFIX=" #$output) + (string-append "MANDIR=" #$output "/share/man"))))) + #:make-flags #~(list "CFLAGS=-fPIC"))) (native-inputs (list which)) (home-page "https://kristaps.bsd.lv/lowdown/") -- 2.34.0 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0004-gnu-nix-Update-to-2.4.patch Content-Transfer-Encoding: quoted-printable >From 7063dd840a9a4cd7960c192d0acb3db869235d11 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 11 Jan 2022 23:10:01 +0800 Subject: [PATCH 4/6] gnu: nix: Update to 2.4. * gnu/packages/package-management.scm (nix): Update to 2.4. [source]: Switch to Github repository since upstream no longer provides tarball. [native-inputs]: Add autoconf, autoconf-archive, automake, bison, flex, gcc, googletest, jq, libtool. [inputs]: Add libarchive, libcpuid, lowdown, zlib. * gnu/packages/patches/nix-dont-build-html-doc.diff: New file. * gnu/local.mk(dist_patch_DATA): Add corresponding entry. --- gnu/local.mk | 1 + gnu/packages/package-management.scm | 66 +++++++++++++------ .../patches/nix-dont-build-html-doc.diff | 26 ++++++++ 3 files changed, 73 insertions(+), 20 deletions(-) create mode 100644 gnu/packages/patches/nix-dont-build-html-doc.diff diff --git a/gnu/local.mk b/gnu/local.mk index feadac4bad..9284212f01 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1515,6 +1515,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/nettle-3.5-check-_pkcs1_sec_decrypt-msg-len.patch \ %D%/packages/patches/nettle-3.5-CVE-2021-3580-pt1.patch \ %D%/packages/patches/nettle-3.5-CVE-2021-3580-pt2.patch \ + %D%/packages/patches/nix-dont-build-html-doc.diff \ %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/ngless-unliftio.patch \ diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-man= agement.scm index 8a4f5155ed..03f741dc2c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -20,6 +20,7 @@ ;;; Copyright =C2=A9 2021 Ivan Gankevich ;;; Copyright =C2=A9 2021 Maxim Cournoyer ;;; Copyright =C2=A9 2021 John Kehayias +;;; Copyright =C2=A9 2022 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -62,6 +63,8 @@ (define-module (gnu packages package-management) #:use-module (gnu packages dbm) #:use-module (gnu packages docbook) #:use-module (gnu packages file) + #:use-module (gnu packages flex) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -70,6 +73,7 @@ (define-module (gnu packages package-management) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) + #:use-module (gnu packages hardware) #:use-module (gnu packages hurd) #:use-module (gnu packages imagemagick) #:use-module (gnu packages less) @@ -77,6 +81,7 @@ (define-module (gnu packages package-management) #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages man) + #:use-module (gnu packages markup) #:use-module (gnu packages nettle) #:use-module (gnu packages networking) #:use-module (gnu packages ninja) @@ -657,14 +662,18 @@ (define-public guix-icons (define-public nix (package (name "nix") - (version "2.3.16") - (source (origin - (method url-fetch) - (uri (string-append "https://releases.nixos.org/nix/nix-" - version "/nix-" version ".tar.xz")) - (sha256 - (base32 - "1g5aqavr6i3c1xln53w1pdh1kvlxrpnknb105m4jbd85kyv83rky")))) + (version "2.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "http://github.com/NixOS/nix") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1abgfw5ndqklm0x533li32l4azifz3f6lhaxm6s74b704043r7m2")) + (patches + (search-patches "nix-dont-build-html-doc.diff")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--sysconfdir=3D/etc" "--enable-gc") @@ -680,18 +689,35 @@ (define-public nix (string-append "sysconfdir=3D" etc) (string-append "profiledir=3D" etc "/profile.d") make-flags))))))) - (native-inputs (list pkg-config)) - (inputs (list boost - brotli - bzip2 - curl - editline - libgc - libseccomp - libsodium - openssl - sqlite - xz)) + (native-inputs + (list autoconf + autoconf-archive + automake + bison + flex + googletest + jq + libtool + pkg-config)) + (inputs + (append (list boost + brotli + bzip2 + curl + editline + libarchive + libgc + libseccomp + libsodium + lowdown + openssl + sqlite + xz + zlib) + (if (or (target-x86-64?) + (target-x86-32?)) + (list libcpuid) + '()))) (home-page "https://nixos.org/nix/") (synopsis "The Nix package manager") (description diff --git a/gnu/packages/patches/nix-dont-build-html-doc.diff b/gnu/packag= es/patches/nix-dont-build-html-doc.diff new file mode 100644 index 0000000000..79142bc215 --- /dev/null +++ b/gnu/packages/patches/nix-dont-build-html-doc.diff @@ -0,0 +1,26 @@ +"--enable-doc-gen" configure flag will enable HTML document generation tha= t requires mdbook. +We can't simply disable it because we need manpages. + +Author: Zhu Zihao + +diff --git a/doc/manual/local.mk b/doc/manual/local.mk +index e43d9f2fb..c323d1847 100644 +--- a/doc/manual/local.mk ++++ b/doc/manual/local.mk +@@ -69,8 +69,6 @@ $(d)/builtins.json: $(bindir)/nix + $(trace-gen) $(dummy-env) NIX_PATH=3Dnix/corepkgs=3Dcorepkgs $(bindir)/n= ix __dump-builtins > $@.tmp + @mv $@.tmp $@ +=20 +-# Generate the HTML manual. +-install: $(docdir)/manual/index.html +=20 + # Generate 'nix' manpages. + install: $(mandir)/man1/nix3-manpages +@@ -94,7 +92,5 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/comman= d-ref/new-cli + done + @touch $@ +=20 +-$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/custom.cs= s $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/command-ref/con= f-file.md $(d)/src/expressions/builtins.md $(call rwildcard, $(d)/src, *.md) +- $(trace-gen) RUST_LOG=3Dwarn mdbook build doc/manual -d $(DESTDIR)$(docd= ir)/manual +=20 + endif --=20 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0005-gnu-nix-Use-G-expression.patch >From 3868c88ed278de703311fe222590b68ee57420e8 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 12 Jan 2022 00:42:32 +0800 Subject: [PATCH 5/6] gnu: nix: Use G-expression. * gnu/packages/package-management.scm (nix)[arguments]: Convert to G-expression. --- gnu/packages/package-management.scm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 03f741dc2c..594d6e9d4b 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -676,19 +676,19 @@ (define-public nix (search-patches "nix-dont-build-html-doc.diff")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--sysconfdir=/etc" "--enable-gc") - #:phases - (modify-phases %standard-phases - (replace 'install - ;; Don't try & fail to create subdirectories in /etc, but keep them - ;; in the output as examples. - (lambda* (#:key (make-flags '()) outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (etc (string-append out "/etc"))) - (apply invoke "make" "install" - (string-append "sysconfdir=" etc) - (string-append "profiledir=" etc "/profile.d") - make-flags))))))) + (list + #:configure-flags #~(list "--sysconfdir=/etc" "--enable-gc") + #:phases + #~(modify-phases %standard-phases + (replace 'install + ;; Don't try & fail to create subdirectories in /etc, but keep them + ;; in the output as examples. + (lambda* (#:key (make-flags '()) outputs #:allow-other-keys) + (let ((etc (string-append #$output "/etc"))) + (apply invoke "make" "install" + (string-append "sysconfdir=" etc) + (string-append "profiledir=" etc "/profile.d") + make-flags))))))) (native-inputs (list autoconf autoconf-archive -- 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0006-gnu-nix-Update-to-2.5.1.patch >From 959060f15cd24e0266d5b106dbefb94c1beeccba Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Fri, 14 Jan 2022 17:30:22 +0800 Subject: [PATCH 6/6] gnu: nix: Update to 2.5.1. * gnu/packages/package-management.scm(nix): Update to 2.5.1. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 594d6e9d4b..9882f0a411 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -662,7 +662,7 @@ (define-public guix-icons (define-public nix (package (name "nix") - (version "2.4") + (version "2.5.1") (source (origin (method git-fetch) @@ -671,7 +671,7 @@ (define-public nix (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1abgfw5ndqklm0x533li32l4azifz3f6lhaxm6s74b704043r7m2")) + (base32 "1m8rmv8i6lg83pmalvjlq1fn8mcghn3ngjv3kw1kqsa45ymj5sqq")) (patches (search-patches "nix-dont-build-html-doc.diff")))) (build-system gnu-build-system) -- 2.34.0 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 14 07:56:29 2022 Received: (at 51747) by debbugs.gnu.org; 14 Jan 2022 12:56:29 +0000 Received: from localhost ([127.0.0.1]:35846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8M85-0005I2-47 for submit@debbugs.gnu.org; Fri, 14 Jan 2022 07:56:29 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:60598) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8M83-0005Hr-Hk for 51747@debbugs.gnu.org; Fri, 14 Jan 2022 07:56:28 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by xavier.telenet-ops.be with bizsmtp id icwR2600C4UW6Th01cwRxY; Fri, 14 Jan 2022 13:56:26 +0100 Message-ID: Subject: Re: [bug#51747] [PATCH]: gnu: nix: Update to 2.4. From: Maxime Devos To: Zhu Zihao , Oleg Pykhalov Date: Fri, 14 Jan 2022 13:56:25 +0100 In-Reply-To: <86h7a664rv.fsf@163.com> References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> <86lf1njad0.fsf@163.com> <86ilw4e6av.fsf@163.com> <87y23mheag.fsf_-_@gmail.com> <86h7a664rv.fsf@163.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-j50bI8OcF2FgNbAIlu5g" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1642164986; bh=m/Ew4z70OGJEJvtYP8P5to2kMNOZn0Ojlmcal49eH08=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=hF5PPohd/sgv3HDQc7A3x8kjk59XRI/922WzfJhAvXEliiMfmUUP5dIgTkwM4QFX1 H22nZgmqnlMHdcMysYGT+p4ATf5aqtGpunzekT617pMP+N3V0E5ugAUwWBnb6EkNl3 ZZ/R2VJKjiSFrGMjynB9OP5BeKLDDuJqqSSjf0VUA379/r1v+x4POmVWNbQDDvLw4a AXqJXOkogz6b57HP+9G1j9IqGeQPG6JnEp5PIHXY2mWTP6tWo1t49cdXJHoNjo6jUW EFiAKZUc067kn/55TONpmTHip+l3cB2JerAOeK/RgOnSZ5fuNOBLgQLRQw7Sm6aQSt sLC/wNjnk4lbQ== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 51747 Cc: 51747@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-j50bI8OcF2FgNbAIlu5g Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: base64 Wmh1IFppaGFvIHNjaHJlZWYgb3AgdnIgMTQtMDEtMjAyMiBvbSAxNzozMSBbKzA4MDBdOgo+IFsu Li5dCj4gKyhkZWZpbmUtcHVibGljIGxpYmNwdWlkCj4gK8KgIChsZXQgKChjb21taXQgIjJlNjEx NjA5ODNmMzJiYTg0MGIyMjQ2ZDNjMzg1MGM0NDYyNmFiMGQiKQo+ICvCoMKgwqDCoMKgwqDCoCAo cmV2aXNpb24gIjEiKSkKPiArwqDCoMKgIChwYWNrYWdlCj4gK8KgwqDCoMKgwqAgKG5hbWUgImxp YmNwdWlkIikKPiArwqDCoMKgwqDCoCAodmVyc2lvbiAoZ2l0LXZlcnNpb24gIjAuNS4xIiByZXZp c2lvbiBjb21taXQpKQoKVGhlcmUncyBhIGdvb2QgcmVhc29uIGZvciB1c2luZyBhbiB1bnJlbGVh c2VzIHZlcnNpb24gaGVyZSwKYnV0IHRoaXMgc2hvdWxkIGlkZWFsbHkgYmUgZG9jdW1lbnRlZCB3 aXRoIGEgY29tbWVudCwKbWF5YmUKCiAgOzsgU2VlIDxodHRwczovL2dpdGh1Yi5jb20vYW5yaWVm Zi9saWJjcHVpZC9wdWxsLzE1OT4KCj4gK8KgwqDCoMKgwqAgKHNvdXJjZQo+ICvCoMKgwqDCoMKg wqAgKG9yaWdpbgo+ICvCoMKgwqDCoMKgwqDCoMKgIChtZXRob2QgZ2l0LWZldGNoKQo+ICvCoMKg wqDCoMKgwqDCoMKgICh1cmkgKGdpdC1yZWZlcmVuY2UKPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoCAodXJsICJodHRwczovL2dpdGh1Yi5jb20vYW5yaWVmZi9saWJjcHVpZCIpCj4gK8Kg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAgKGNvbW1pdCBjb21taXQpKSkKPiArwqDCoMKgwqDC oMKgwqDCoCAoc2hhMjU2Cj4gK8KgwqDCoMKgwqDCoMKgwqDCoCAoYmFzZTMyCj4gIjFtcGh2a2lx cTZ6MzNzcTZpNDkwZnEyN3NieXlsYWN3cmY4Ymc3Y2N2cGNqbXMyMDhzd3ciKSkKPiArwqDCoMKg wqDCoMKgwqDCoCAobW9kdWxlcyAnKChndWl4IGJ1aWxkIHV0aWxzKSkpCj4gK8KgwqDCoMKgwqDC oMKgwqAgKHNuaXBwZXQKPiArwqDCoMKgwqDCoMKgwqDCoMKgIDs7IFJlbW92ZSBibG9icwo+ICvC oMKgwqDCoMKgwqDCoMKgwqAgI34oYmVnaW4KPiArwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAg KGRlbGV0ZS1maWxlICJsaWJjcHVpZC9tc3Jkcml2ZXIuYyIpCj4gK8KgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgIChkZWxldGUtZmlsZS1yZWN1cnNpdmVseSAiY29udHJpYi9NU1IgRHJpdmVyIikp KQo+ICvCoMKgwqDCoMKgwqDCoMKgIChmaWxlLW5hbWUgKGdpdC1maWxlLW5hbWUgbmFtZSB2ZXJz aW9uKSkpKQo+ICvCoMKgwqDCoMKgIChidWlsZC1zeXN0ZW0gY21ha2UtYnVpbGQtc3lzdGVtKQo+ ICvCoMKgwqDCoMKgIChhcmd1bWVudHMKPiArwqDCoMKgwqDCoMKgIChsaXN0ICM6dGVzdHM/ICNm KSnCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoCA7YnJva2VuCgpJbiB3aGljaCBtYW5uZXIgYXJl IHRoZXkgYnJva2VuPyAgTWF5YmUgdGhleSBjYW4gYmUgZmlzZWQuCgo+ICvCoMKgwqDCoMKgIChz dXBwb3J0ZWQtc3lzdGVtcyAnKCJ4ODZfNjQtbGludXgiICJpNjg2LWxpbnV4IikpCgpTZWUgbXkg ZS1tYWlsIGFib3V0IHRhcmdldC14ODYtNjQ/IGFuZCB0aGUgSHVyZC4KCj4gK8KgwqDCoMKgwqAg KGhvbWUtcGFnZSAiaHR0cHM6Ly9saWJjcHVpZC5zb3VyY2Vmb3JnZS5uZXQvIikKPiArwqDCoMKg wqDCoCAoc3lub3BzaXMgIlNtYWxsIGxpYnJhcnkgZm9yIHg4NiBDUFUgZGV0ZWN0aW9uIGFuZCBm ZWF0dXJlCj4gZXh0cmFjdGlvbiIpCj4gK8KgwqDCoMKgwqAgKGRlc2NyaXB0aW9uICJMaWJjcHVp ZCBpcyBhIHNtYWxsIEMgbGlicmFyeSB0byBnZXQgdmVuZG9yLAo+IG1vZGVsLCBicmFuZGluZwo+ ICtzdHJpbmcsIGNvZGUgbmFtZSBhbmQgb3RoZXIgaW5mb3JtYXRpb24gZnJvbSB4ODYgQ1BVLiIp CgpJdCBzZWVtcyBlYXN5IHRvIGNvbmZ1c2UgdGhpcyB3aXRoIHRoZSBwYWNrYWdlICdjcHVpZCcs IG1heWJlIHlvdQpjYW4gbWVudGlvbiAnY3B1aWQnIGFuZCAnbGliY3B1aWQnIGFyZSB1bnJlbGF0 ZWQgcGFja2FnZXMsIGFsYmVpdApmb3IgYSBzaW1pbGFyIHB1cnBvc2U/CgpHcmVldGluZ3MsCk1h eGltZS4K --=-j50bI8OcF2FgNbAIlu5g Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYeFy+RccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7oZ5AP4mecQainXGPjap85CJwYl56+b+ P0l2tZVtP0OBYXsWiQEA65G/wyTV0UzoGOsLo89HY0WcxuqJai29sTAq/l1M/wc= =PNGh -----END PGP SIGNATURE----- --=-j50bI8OcF2FgNbAIlu5g-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 14 08:06:45 2022 Received: (at 51747) by debbugs.gnu.org; 14 Jan 2022 13:06:45 +0000 Received: from localhost ([127.0.0.1]:35856 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8MHx-0005aR-4r for submit@debbugs.gnu.org; Fri, 14 Jan 2022 08:06:45 -0500 Received: from andre.telenet-ops.be ([195.130.132.53]:54740) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8MHt-0005aE-Ec for 51747@debbugs.gnu.org; Fri, 14 Jan 2022 08:06:39 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by andre.telenet-ops.be with bizsmtp id id6b2600L4UW6Th01d6bTR; Fri, 14 Jan 2022 14:06:35 +0100 Message-ID: Subject: Re: [bug#51747] [PATCH]: gnu: nix: Update to 2.4. From: Maxime Devos To: Zhu Zihao Date: Fri, 14 Jan 2022 14:06:27 +0100 In-Reply-To: <86zgo0nsgf.fsf@163.com> References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> <86lf1njad0.fsf@163.com> <86ilw4e6av.fsf@163.com> <87y23mheag.fsf_-_@gmail.com> <86pmoyrxyy.fsf@163.com> <190ec030edbca1c16fb030c51acd60ffc6bae269.camel@telenet.be> <86zgo0nsgf.fsf@163.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-TdwN6/UuN9JFQaTE+bnj" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1642165595; bh=gGaIq4cnQQAc1BUrrpnMVCLYZAALe8khSZU7ppLl1JA=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=F2FT8ys7nGzSs3TuyjHIjJSGgjaV7etAiNDOPYelBBWxBdPBSanSIg81d9sjWll/d TRxONOSgDl0nu1PE7G1qBfPaO3GDyU4kVY6Wo9qCLP4R6yXixb319CgL94OurbaP1C x87LrQlQsC48znVV5FQhoCkukANu9hI9F8QzHX/SKkyLzo/PQmKj6f8igX53wSyuWy fnh9ZleCQd7jC/a/GN2r4vxEbxh5Hd9drNVXyfJSTR0GAqMCWlgJhz/239ExpAUG1B 43kYZ/ewd94vB9IaVbElMi7lwwhJlPhlf4Qie8hO9utaIP5RiE4zKBv+w87I/8qPoF BgPmbaEf0rTpQ== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 51747 Cc: Oleg Pykhalov , 51747@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-TdwN6/UuN9JFQaTE+bnj Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Zhu Zihao schreef op do 13-01-2022 om 12:54 [+0800]: > Maxime Devos writes: >=20 > > Could you change it to > >=20 > > (filter (lambda (t) (or (x86-64-target? t) (or (x86-32-target? t)))) > > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0%supported-systems) >=20 > I found that it actually only supports Linux & Windows. There're only > code stubs for other platform. I doubt this, since libcpuid.h mentions FreeBSD and Solaris support, and 'libcpuid/asm-bits.c' uses 'cpuid' whether it is Linux or Windows or not. Possibly there's more information available for Linux and Windows than for the hurd (see e.g. 'libcpuid/rdmsr.c'), but it would seem that _some_ usable information is available elsewhere. Also, 'libcpuid/rdmsr.c' uses 'modprobe', does this need to be absolutised? Greetings, Maxime. --=-TdwN6/UuN9JFQaTE+bnj Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYeF1UxccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7q52AQDX7Z/T/D8HevVOk/5pvtH+w1// dGJzom1HykDesPj9awD+KCO8qdctufZ9FNFVDxERWx2jqcnVKeUDfXwm3EzcIwg= =6NM7 -----END PGP SIGNATURE----- --=-TdwN6/UuN9JFQaTE+bnj-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 14 11:57:09 2022 Received: (at 51747) by debbugs.gnu.org; 14 Jan 2022 16:57:10 +0000 Received: from localhost ([127.0.0.1]:37979 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8Psr-0006bv-Qa for submit@debbugs.gnu.org; Fri, 14 Jan 2022 11:57:09 -0500 Received: from mail-m973.mail.163.com ([123.126.97.3]:51696) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8Psl-0006bR-Ap for 51747@debbugs.gnu.org; Fri, 14 Jan 2022 11:57:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=hG3Zg 0ArAwNf6yrH3eaPKp27wGFTZCErlhSd+avt4qQ=; b=anm10f5o2cYFzxnKWg0mG MsGI7earyaWDEmraqKLEBYOC/+OMgGP7wvfaRwkJXKRFSYfmse2IePiyb9yR955U 3moXkmoJsOaS36M2cfdhyHF4TsuCAziXreFWbbcVZcDl176wrO0Q4YYMhW3VC4gr uQ1uFRFhMZAnUKOWxQZnS8= Received: from asus-laptop (unknown [163.125.202.182]) by smtp3 (Coremail) with SMTP id G9xpCgA3PTFLq+FhzYtdAA--.17400S2; Sat, 15 Jan 2022 00:56:44 +0800 (CST) References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> <86lf1njad0.fsf@163.com> <86ilw4e6av.fsf@163.com> <87y23mheag.fsf_-_@gmail.com> <86pmoyrxyy.fsf@163.com> <190ec030edbca1c16fb030c51acd60ffc6bae269.camel@telenet.be> <86zgo0nsgf.fsf@163.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Maxime Devos Subject: Re: [bug#51747] [PATCH]: gnu: nix: Update to 2.4. Date: Sat, 15 Jan 2022 00:51:29 +0800 In-reply-to: Message-ID: <86pmoucl3g.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: G9xpCgA3PTFLq+FhzYtdAA--.17400S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4RgZ2TUUUUU X-Originating-IP: [163.125.202.182] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBZgyIr1aD+xUpMgAAst X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51747 Cc: Oleg Pykhalov , 51747@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Patches updated. The test is disabled by default, when I tried enable it test it fails, It looks like that the RPATH of test binary is not complete. Just leave it disabled. I have no idea to give user a hint of differnce between cpuid and libcpuid. Maybe add a comment or add it to description. But I don't think user can find these hints in first sight. --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYeGrMxUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/kG/gD/X+CRIJK6d3C9n+ULwfB8J1lG2yKu 83q/KrIyHb5hgWsBANc8eHCPw+AvZJFq859rMNml7/P4M0KNSfsEV5yGY9gM =Z83R -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-libcpuid.patch Content-Transfer-Encoding: quoted-printable >From 0de84768a9d5f46d25d9442e8d1fbad4b55674b9 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 11 Jan 2022 22:56:14 +0800 Subject: [PATCH 1/6] gnu: Add libcpuid. * gnu/packages/hardware.scm (libcpuid): New variable. --- gnu/packages/hardware.scm | 49 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 8727f0f20a..e5a2c5c13f 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -9,6 +9,7 @@ ;;; Copyright =C2=A9 2021 Raghav Gururajan ;;; Copyright =C2=A9 2021 Vinicius Monego ;;; Copyright =C2=A9 2021, 2022 John Kehayias +;;; Copyright =C2=A9 2022 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -70,7 +71,8 @@ (define-module (gnu packages hardware) #:use-module (guix svn-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) - #:use-module (guix utils)) + #:use-module (guix utils) + #:use-module (srfi srfi-1)) =20 ;; This is a module for packages related to physical hardware that don't (= yet) ;; have a more specific home like gps.scm, security-token.scm, &c. @@ -953,3 +955,48 @@ (define-public tpm2-tss libtss2-esys, libtss2-sys, libtss2-mu, libtss2-tcti-device, libtss2-tcti-s= wtpm and libtss2-tcti-mssim.") (license license:bsd-2))) + +(define-public libcpuid + ;; We need to remove blobs from the source, first we have to isolate the= blob + ;; source in build system. + ;; See https://github.com/anrieff/libcpuid/pull/159. + (let ((commit "2e61160983f32ba840b2246d3c3850c44626ab0d") + (revision "1")) + (package + (name "libcpuid") + (version (git-version "0.5.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/anrieff/libcpuid") + (commit commit))) + (sha256 + (base32 "1mphvkiqq6z33sq6i490fq27sbyylacwrf8bg7ccvpcjms208sww")) + (modules '((guix build utils))) + (snippet + ;; Now remove blobs. + #~(begin + (delete-file "libcpuid/msrdriver.c") + (delete-file-recursively "contrib/MSR Driver"))) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f ;no test + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'absolutize + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "libcpuid/rdmsr.c" + (("modprobe") + (search-input-file inputs "bin/modprobe")))))))) + (inputs (list kmod)) + (supported-systems + (filter (lambda (t) (or (target-x86-64? t) (target-x86-32? t))) + %supported-systems)) + (home-page "https://libcpuid.sourceforge.net/") + (synopsis "Small library for x86 CPU detection and feature extractio= n") + (description "Libcpuid is a small C library to get vendor, model, br= anding +string, code name and other information from x86 CPU.") + (license license:bsd-2)))) --=20 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-lowdown-Update-to-0.10.0-1-1de10c1.patch >From a89d730d8422e703293d4569c15f4e1ede6e0d28 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 11 Jan 2022 23:01:38 +0800 Subject: [PATCH 2/6] gnu: lowdown: Update to 0.10.0-1-1de10c1. * gnu/packages/markup.scm (lowdown): Update to 0.10.0-1-1de10c1. --- gnu/packages/markup.scm | 60 ++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 5f2f525cd2..563ad1e8e1 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -119,34 +119,40 @@ (define-public markdown "See License.text in the distribution.")))) (define-public lowdown - (package - (name "lowdown") - (version "0.10.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-" - version ".tar.gz")) - (sha256 - (base32 "15v2kk4ffqw3n6y6n9plch4qcib3ynnhw0ih8wn2v9qgn4jssp5p")))) - (build-system gnu-build-system) - (arguments - `(#:test-target "regress" - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "./configure" - (string-append "PREFIX=" out) - (string-append "MANDIR=" out "/share/man")))))))) - (native-inputs - (list which)) - (home-page "https://kristaps.bsd.lv/lowdown/") - (synopsis "Simple Markdown translator") - (description "Lowdown is a Markdown translator producing HTML5, + (let ((commit "1de10c1d71bfb4348ae0beaec8b1547d5e114969") + (revision "1")) + (package + (name "lowdown") + (version (git-version "0.10.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kristapsdz/lowdown") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1wh07nkiihvp1m79sj4qlnqklnn0rfp3hwls8sqcp0bfd96wpa1h")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "regress" + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "./configure" + (string-append "PREFIX=" out) + (string-append "MANDIR=" out "/share/man")))))) + #:make-flags '("CFLAGS=-fPIC")))) + + (native-inputs + (list which)) + (home-page "https://kristaps.bsd.lv/lowdown/") + (synopsis "Simple Markdown translator") + (description "Lowdown is a Markdown translator producing HTML5, roff documents in the ms and man formats, LaTeX, gemini, and terminal output.") - (license license:isc))) + (license license:isc)))) (define-public discount (package -- 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0003-gnu-lowdown-Use-G-expression.patch >From 20f81d5df49aed828453c70bf48f73f46ea243ba Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 12 Jan 2022 00:52:25 +0800 Subject: [PATCH 3/6] gnu: lowdown: Use G-expression. * gnu/packages/markup.scm(lowdown)[arguments]: Convert to G-expression. --- gnu/packages/markup.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 563ad1e8e1..7a776b9101 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -29,6 +29,7 @@ (define-module (gnu packages markup) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) @@ -135,17 +136,16 @@ (define-public lowdown (base32 "1wh07nkiihvp1m79sj4qlnqklnn0rfp3hwls8sqcp0bfd96wpa1h")))) (build-system gnu-build-system) (arguments - `(#:test-target "regress" - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "./configure" - (string-append "PREFIX=" out) - (string-append "MANDIR=" out "/share/man")))))) - #:make-flags '("CFLAGS=-fPIC")))) - + (list + #:test-target "regress" + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda _ + (invoke "./configure" + (string-append "PREFIX=" #$output) + (string-append "MANDIR=" #$output "/share/man"))))) + #:make-flags #~(list "CFLAGS=-fPIC"))) (native-inputs (list which)) (home-page "https://kristaps.bsd.lv/lowdown/") -- 2.34.0 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0004-gnu-nix-Update-to-2.4.patch Content-Transfer-Encoding: quoted-printable >From dcabfb785372d0b0af11e75d62896522f42ec359 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 11 Jan 2022 23:10:01 +0800 Subject: [PATCH 4/6] gnu: nix: Update to 2.4. * gnu/packages/package-management.scm (nix): Update to 2.4. [source]: Switch to Github repository since upstream no longer provides tarball. [native-inputs]: Add autoconf, autoconf-archive, automake, bison, flex, gcc, googletest, jq, libtool. [inputs]: Add libarchive, libcpuid, lowdown, zlib. * gnu/packages/patches/nix-dont-build-html-doc.diff: New file. * gnu/local.mk(dist_patch_DATA): Add corresponding entry. --- gnu/local.mk | 1 + gnu/packages/package-management.scm | 66 +++++++++++++------ .../patches/nix-dont-build-html-doc.diff | 26 ++++++++ 3 files changed, 73 insertions(+), 20 deletions(-) create mode 100644 gnu/packages/patches/nix-dont-build-html-doc.diff diff --git a/gnu/local.mk b/gnu/local.mk index feadac4bad..9284212f01 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1515,6 +1515,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/nettle-3.5-check-_pkcs1_sec_decrypt-msg-len.patch \ %D%/packages/patches/nettle-3.5-CVE-2021-3580-pt1.patch \ %D%/packages/patches/nettle-3.5-CVE-2021-3580-pt2.patch \ + %D%/packages/patches/nix-dont-build-html-doc.diff \ %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/ngless-unliftio.patch \ diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-man= agement.scm index 8a4f5155ed..03f741dc2c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -20,6 +20,7 @@ ;;; Copyright =C2=A9 2021 Ivan Gankevich ;;; Copyright =C2=A9 2021 Maxim Cournoyer ;;; Copyright =C2=A9 2021 John Kehayias +;;; Copyright =C2=A9 2022 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -62,6 +63,8 @@ (define-module (gnu packages package-management) #:use-module (gnu packages dbm) #:use-module (gnu packages docbook) #:use-module (gnu packages file) + #:use-module (gnu packages flex) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -70,6 +73,7 @@ (define-module (gnu packages package-management) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) + #:use-module (gnu packages hardware) #:use-module (gnu packages hurd) #:use-module (gnu packages imagemagick) #:use-module (gnu packages less) @@ -77,6 +81,7 @@ (define-module (gnu packages package-management) #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages man) + #:use-module (gnu packages markup) #:use-module (gnu packages nettle) #:use-module (gnu packages networking) #:use-module (gnu packages ninja) @@ -657,14 +662,18 @@ (define-public guix-icons (define-public nix (package (name "nix") - (version "2.3.16") - (source (origin - (method url-fetch) - (uri (string-append "https://releases.nixos.org/nix/nix-" - version "/nix-" version ".tar.xz")) - (sha256 - (base32 - "1g5aqavr6i3c1xln53w1pdh1kvlxrpnknb105m4jbd85kyv83rky")))) + (version "2.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "http://github.com/NixOS/nix") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1abgfw5ndqklm0x533li32l4azifz3f6lhaxm6s74b704043r7m2")) + (patches + (search-patches "nix-dont-build-html-doc.diff")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--sysconfdir=3D/etc" "--enable-gc") @@ -680,18 +689,35 @@ (define-public nix (string-append "sysconfdir=3D" etc) (string-append "profiledir=3D" etc "/profile.d") make-flags))))))) - (native-inputs (list pkg-config)) - (inputs (list boost - brotli - bzip2 - curl - editline - libgc - libseccomp - libsodium - openssl - sqlite - xz)) + (native-inputs + (list autoconf + autoconf-archive + automake + bison + flex + googletest + jq + libtool + pkg-config)) + (inputs + (append (list boost + brotli + bzip2 + curl + editline + libarchive + libgc + libseccomp + libsodium + lowdown + openssl + sqlite + xz + zlib) + (if (or (target-x86-64?) + (target-x86-32?)) + (list libcpuid) + '()))) (home-page "https://nixos.org/nix/") (synopsis "The Nix package manager") (description diff --git a/gnu/packages/patches/nix-dont-build-html-doc.diff b/gnu/packag= es/patches/nix-dont-build-html-doc.diff new file mode 100644 index 0000000000..79142bc215 --- /dev/null +++ b/gnu/packages/patches/nix-dont-build-html-doc.diff @@ -0,0 +1,26 @@ +"--enable-doc-gen" configure flag will enable HTML document generation tha= t requires mdbook. +We can't simply disable it because we need manpages. + +Author: Zhu Zihao + +diff --git a/doc/manual/local.mk b/doc/manual/local.mk +index e43d9f2fb..c323d1847 100644 +--- a/doc/manual/local.mk ++++ b/doc/manual/local.mk +@@ -69,8 +69,6 @@ $(d)/builtins.json: $(bindir)/nix + $(trace-gen) $(dummy-env) NIX_PATH=3Dnix/corepkgs=3Dcorepkgs $(bindir)/n= ix __dump-builtins > $@.tmp + @mv $@.tmp $@ +=20 +-# Generate the HTML manual. +-install: $(docdir)/manual/index.html +=20 + # Generate 'nix' manpages. + install: $(mandir)/man1/nix3-manpages +@@ -94,7 +92,5 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/comman= d-ref/new-cli + done + @touch $@ +=20 +-$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/custom.cs= s $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/command-ref/con= f-file.md $(d)/src/expressions/builtins.md $(call rwildcard, $(d)/src, *.md) +- $(trace-gen) RUST_LOG=3Dwarn mdbook build doc/manual -d $(DESTDIR)$(docd= ir)/manual +=20 + endif --=20 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0005-gnu-nix-Use-G-expression.patch >From 25b4055977e28a3efc8f0ee4af2906e4e923c7d9 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 12 Jan 2022 00:42:32 +0800 Subject: [PATCH 5/6] gnu: nix: Use G-expression. * gnu/packages/package-management.scm (nix)[arguments]: Convert to G-expression. --- gnu/packages/package-management.scm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 03f741dc2c..594d6e9d4b 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -676,19 +676,19 @@ (define-public nix (search-patches "nix-dont-build-html-doc.diff")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--sysconfdir=/etc" "--enable-gc") - #:phases - (modify-phases %standard-phases - (replace 'install - ;; Don't try & fail to create subdirectories in /etc, but keep them - ;; in the output as examples. - (lambda* (#:key (make-flags '()) outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (etc (string-append out "/etc"))) - (apply invoke "make" "install" - (string-append "sysconfdir=" etc) - (string-append "profiledir=" etc "/profile.d") - make-flags))))))) + (list + #:configure-flags #~(list "--sysconfdir=/etc" "--enable-gc") + #:phases + #~(modify-phases %standard-phases + (replace 'install + ;; Don't try & fail to create subdirectories in /etc, but keep them + ;; in the output as examples. + (lambda* (#:key (make-flags '()) outputs #:allow-other-keys) + (let ((etc (string-append #$output "/etc"))) + (apply invoke "make" "install" + (string-append "sysconfdir=" etc) + (string-append "profiledir=" etc "/profile.d") + make-flags))))))) (native-inputs (list autoconf autoconf-archive -- 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0006-gnu-nix-Update-to-2.5.1.patch >From d81e689fa1acd5eb4a2fee325609216a24a9b887 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Fri, 14 Jan 2022 17:30:22 +0800 Subject: [PATCH 6/6] gnu: nix: Update to 2.5.1. * gnu/packages/package-management.scm(nix): Update to 2.5.1. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 594d6e9d4b..9882f0a411 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -662,7 +662,7 @@ (define-public guix-icons (define-public nix (package (name "nix") - (version "2.4") + (version "2.5.1") (source (origin (method git-fetch) @@ -671,7 +671,7 @@ (define-public nix (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1abgfw5ndqklm0x533li32l4azifz3f6lhaxm6s74b704043r7m2")) + (base32 "1m8rmv8i6lg83pmalvjlq1fn8mcghn3ngjv3kw1kqsa45ymj5sqq")) (patches (search-patches "nix-dont-build-html-doc.diff")))) (build-system gnu-build-system) -- 2.34.0 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 14 13:40:11 2022 Received: (at 51747) by debbugs.gnu.org; 14 Jan 2022 18:40:11 +0000 Received: from localhost ([127.0.0.1]:38128 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8RUg-0001G0-Ky for submit@debbugs.gnu.org; Fri, 14 Jan 2022 13:40:11 -0500 Received: from laurent.telenet-ops.be ([195.130.137.89]:32942) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8RUd-0001Fk-Kw for 51747@debbugs.gnu.org; Fri, 14 Jan 2022 13:40:09 -0500 Received: from [172.20.10.5] ([188.188.180.33]) by laurent.telenet-ops.be with bizsmtp id iig5260010je1N401ig5mr; Fri, 14 Jan 2022 19:40:06 +0100 Message-ID: Subject: Re: [bug#51747] [PATCH]: gnu: nix: Update to 2.4. From: Maxime Devos To: Zhu Zihao Date: Fri, 14 Jan 2022 18:39:48 +0000 In-Reply-To: <86pmoucl3g.fsf@163.com> References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> <86lf1njad0.fsf@163.com> <86ilw4e6av.fsf@163.com> <87y23mheag.fsf_-_@gmail.com> <86pmoyrxyy.fsf@163.com> <190ec030edbca1c16fb030c51acd60ffc6bae269.camel@telenet.be> <86zgo0nsgf.fsf@163.com> <86pmoucl3g.fsf@163.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-Nk4lgWPIPLzG+GhB2OWu" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1642185606; bh=JltyC6cnlpwMqGwKIsqx/7OC7jwvULZhfbEKpuzcnSs=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=LHu+7a6Ss8UQ5G3lSJ50oGjF5YgCizZSKSfkUfusn+qO8SvUg3x5CLPQndECXFurc xCpbngPv85HCWDwkRO0Fr4yHK/excIoU8DuxQVje/qhwMSxrZSL36ZccFD4rMp0ZZv Bdb2EEtJtW8upWo46G3DdcmeavbVEJCqPpWD5XpNHMhRLJ+6zn4aUNAacxgg4VdjjW ICSIN/49b3lObU0/ZUcSNugSU8PzvdyoWPYbskn+gDZbizHs45Oy2UBqNVdmJhqUhD AcqUE25NJ2VTpH0dt/Rn8JXT/cqjWEdlyysj06nv8ycSymgkcWa//xw3rh8FgMO6Gu aI2QvZoP12wLg== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 51747 Cc: Oleg Pykhalov , 51747@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-Nk4lgWPIPLzG+GhB2OWu Content-Type: multipart/mixed; boundary="=-wPQFf1NIV8jB3o94L8KC" --=-wPQFf1NIV8jB3o94L8KC Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Zhu Zihao schreef op za 15-01-2022 om 00:51 [+0800]: > Patches updated. >=20 > The test is disabled by default, when I tried enable it test it fails, > It looks like that the RPATH of test binary is not complete. Just leave > it disabled. I didn't see anyting RUNPATH (*) related. It failed to run some python script though with =E2=80=98file does not exist=E2=80=99 (which could maybe= indicate RUNPATH problems, but not in this case), it turned out that the shebang wasn't patched. Adding python to the native-inputs appears to fix things > I have no idea to gi.ve user a hint of differnce between cpuid and > libcpuid. Maybe add a comment or add it to description. But I don't > think user can find these hints in first sight. See attachement for a variant of the 'libcpuid' package that builds for me (--system=3Dx86-64-linux, with tests)=C2=A0and cross-builds to --target=3Di586-pc-gnu (tests automatically disabled because of cross- compilation). 'kmod' only exists on Linux, so I modified the inputs and 'absolutize' to only use it when building for Linux. I don't think many users look at the description either, but it seems a logical place to look in case of trouble. I added a sentence. I modified the package definition outside emacs and outside a git checkout, so the indentation probably needs some fixing. Greetings, Maxime. (*) IIRC Guix uses RUNPATH and not RPATH. --=-wPQFf1NIV8jB3o94L8KC Content-Disposition: attachment; filename="stuff.scm" Content-Transfer-Encoding: base64 Content-Type: text/x-scheme; name="stuff.scm"; charset="UTF-8" Cih1c2UtbW9kdWxlcyAoZ3VpeCBzdm4tZG93bmxvYWQpCiAgICAoKGd1aXggbGljZW5zZXMpICM6 cHJlZml4IGxpY2Vuc2U6KQogICAgKGdudSBwYWNrYWdlcyBsaW51eCkKICAgIChnbnUgcGFja2Fn ZXMgcHl0aG9uKQogICAgKGd1aXggcGFja2FnZXMpCiAgICAoZ3VpeCBnZXhwKQogICAgKGd1aXgg cGFja2FnZXMpCiAgICAoZ3VpeCBnaXQtZG93bmxvYWQpCiAgICAoZ3VpeCBidWlsZC1zeXN0ZW0g Y21ha2UpCiAgICAoZ3VpeCB1dGlscykKICAgIChzcmZpIHNyZmktMSkpCgooZGVmaW5lLXB1Ymxp YyBsaWJjcHVpZAogIDs7IFdlIG5lZWQgdG8gcmVtb3ZlIGJsb2JzIGZyb20gdGhlIHNvdXJjZSwg Zmlyc3Qgd2UgaGF2ZSB0byBpc29sYXRlIHRoZSBibG9iCiAgOzsgc291cmNlIGluIGJ1aWxkIHN5 c3RlbS4KICA7OyBTZWUgPGh0dHBzOi8vZ2l0aHViLmNvbS9hbnJpZWZmL2xpYmNwdWlkL3B1bGwv MTU5Pi4KICAobGV0ICgoY29tbWl0ICIyZTYxMTYwOTgzZjMyYmE4NDBiMjI0NmQzYzM4NTBjNDQ2 MjZhYjBkIikKICAgICAgICAocmV2aXNpb24gIjEiKSkKICAgIChwYWNrYWdlCiAgICAgIChuYW1l ICJsaWJjcHVpZCIpCiAgICAgICh2ZXJzaW9uIChnaXQtdmVyc2lvbiAiMC41LjEiIHJldmlzaW9u IGNvbW1pdCkpCiAgICAgIChzb3VyY2UKICAgICAgIChvcmlnaW4KICAgICAgICAgKG1ldGhvZCBn aXQtZmV0Y2gpCiAgICAgICAgICh1cmkgKGdpdC1yZWZlcmVuY2UKICAgICAgICAgICAgICAgKHVy bCAiaHR0cHM6Ly9naXRodWIuY29tL2FucmllZmYvbGliY3B1aWQiKQogICAgICAgICAgICAgICAo Y29tbWl0IGNvbW1pdCkpKQogICAgICAgICAoc2hhMjU2CiAgICAgICAgICAoYmFzZTMyICIxbXBo dmtpcXE2ejMzc3E2aTQ5MGZxMjdzYnl5bGFjd3JmOGJnN2NjdnBjam1zMjA4c3d3IikpCiAgICAg ICAgIChtb2R1bGVzICcoKGd1aXggYnVpbGQgdXRpbHMpKSkKICAgICAgICAgKHNuaXBwZXQKICAg ICAgICAgIDs7IE5vdyByZW1vdmUgYmxvYnMuCiAgICAgICAgICAjfihiZWdpbgogICAgICAgICAg ICAgIChkZWxldGUtZmlsZSAibGliY3B1aWQvbXNyZHJpdmVyLmMiKQogICAgICAgICAgICAgIChk ZWxldGUtZmlsZS1yZWN1cnNpdmVseSAiY29udHJpYi9NU1IgRHJpdmVyIikpKQogICAgICAgICAo ZmlsZS1uYW1lIChnaXQtZmlsZS1uYW1lIG5hbWUgdmVyc2lvbikpKSkKICAgICAgKGJ1aWxkLXN5 c3RlbSBjbWFrZS1idWlsZC1zeXN0ZW0pCiAgICAgIChhcmd1bWVudHMKICAgICAgIChsaXN0CiAg ICAgICAgIzptb2R1bGVzICcoKHJucnMgZXhjZXB0aW9ucykKICAgICAgICAgICAgICAgICAgICAo Z3VpeCBidWlsZCBjbWFrZS1idWlsZC1zeXN0ZW0pCiAgICAgICAgICAgICAgICAgICAgKGd1aXgg YnVpbGQgdXRpbHMpKQogICAgICAgICM6Y29uZmlndXJlLWZsYWdzICN+JygiLURMSUJDUFVJRF9U RVNUUz1PTiIpIAogICAgICAgICM6cGhhc2VzCiAgICAgICAgI34obW9kaWZ5LXBoYXNlcyAlc3Rh bmRhcmQtcGhhc2VzCiAgICAgICAgICAgIChhZGQtYWZ0ZXIgJ3VucGFjayAnYWJzb2x1dGl6ZQog ICAgICAgICAgICAgIChsYW1iZGEqICgjOmtleSBpbnB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQog ICAgICAgICAgICAgICAgOzsgbW9kcHJvYmUgZG9lc24ndCBleGlzdCBvbiB0aGUgSHVyZCAKICAg ICAgICAgICAgICAgIChndWFyZCAoYyAoKHNlYXJjaC1lcnJvcj8gYykgKHZhbHVlcykpKQogICAg ICAgICAgICAgICAgICAoc3Vic3RpdHV0ZSogImxpYmNwdWlkL3JkbXNyLmMiCiAgICAgICAgICAg ICAgICAgICAgKCgibW9kcHJvYmUiKQogICAgICAgICAgICAgICAgICAgICAoc2VhcmNoLWlucHV0 LWZpbGUgaW5wdXRzICJiaW4vbW9kcHJvYmUiKSkpKSkpKSkpCiAgICAgIChpbnB1dHMgKGlmICh0 YXJnZXQtbGludXg/KQogICAgICAgICAgICAgICAgICAobGlzdCBrbW9kKSA7IGxpbnV4LW9ubHkK ICAgICAgICAgICAgICAgICAgJygpKSkKICAgICAgOzsgYSBweXRob24gZnJvbSB0aGUgMy4gc2Vy aWVzIGlzIHJlcXVpcmVkIGJ5IHRlc3RzCiAgICAgIChuYXRpdmUtaW5wdXRzIChsaXN0IHB5dGhv bi0zKSkKICAgICAgKHN1cHBvcnRlZC1zeXN0ZW1zCiAgICAgICAoZmlsdGVyIChsYW1iZGEgKHQp IChvciAodGFyZ2V0LXg4Ni02ND8gdCkgKHRhcmdldC14ODYtMzI/IHQpKSkKICAgICAgICAgICAg ICAgJXN1cHBvcnRlZC1zeXN0ZW1zKSkKICAgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9saWJjcHVp ZC5zb3VyY2Vmb3JnZS5uZXQvIikKICAgICAgKHN5bm9wc2lzICJTbWFsbCBsaWJyYXJ5IGZvciB4 ODYgQ1BVIGRldGVjdGlvbiBhbmQgZmVhdHVyZSBleHRyYWN0aW9uIikKICAgICAgKGRlc2NyaXB0 aW9uICJMaWJjcHVpZCBpcyBhIHNtYWxsIEMgbGlicmFyeSB0byBnZXQgdmVuZG9yLCBtb2RlbCwg YnJhbmRpbmcKc3RyaW5nLCBjb2RlIG5hbWUgYW5kIG90aGVyIGluZm9ybWF0aW9uIGZyb20geDg2 IENQVS4gIFRoaXMgbGlicmFyeSBpcyBub3QKdG8gYmUgY29uZnVzZWQgd2l0aCB0aGUgQGNvZGV7 Y3B1aWR9IGNvbW1hbmQgbGluZSB1dGlsaXR5IGZyb21tIHRoZQpAY29kZXtjcHVpZH0gcGFja2Fn ZS4iKQogICAgICAobGljZW5zZSBsaWNlbnNlOmJzZC0yKSkpKQoKbGliY3B1aWQK --=-wPQFf1NIV8jB3o94L8KC-- --=-Nk4lgWPIPLzG+GhB2OWu Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYeHDdBccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7iwFAP9RAvY9xc+xQjcgbtflxBvkWvno aqmVa23kmc5iRH2DSAEAnn5BB8Zm0IjZdpz0ahdM8RESArLjUBAZxQTCqbQczgw= =UDrF -----END PGP SIGNATURE----- --=-Nk4lgWPIPLzG+GhB2OWu-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 14 21:02:25 2022 Received: (at 51747) by debbugs.gnu.org; 15 Jan 2022 02:02:25 +0000 Received: from localhost ([127.0.0.1]:38656 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8YOf-0001HL-8S for submit@debbugs.gnu.org; Fri, 14 Jan 2022 21:02:25 -0500 Received: from mail-m973.mail.163.com ([123.126.97.3]:39932) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8YOc-0001H1-B9 for 51747@debbugs.gnu.org; Fri, 14 Jan 2022 21:02:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=1rNWB Vua4G6jZeglqXlD6ZsS3Y4EgcZQ8wz3iZgG/FU=; b=lz2ti5P7867BWmSDwS8Xy toHLh/hQzcx4ZSlnagSPAu6yV4W9H7SJT/d9y2IvXzles+DEle0YczH9IQljRXn0 7vumCAnIIHGbg+WSD/zBkGIS9rwo3dwmgcU0ZCnXmpZ53CAUE2eb4KBsbd6ZRVzs /X2YFb3Uu/WxMz2CNVo18I= Received: from asus-laptop (unknown [163.125.202.182]) by smtp3 (Coremail) with SMTP id G9xpCgCnrjIkK+JhgGGJAA--.24516S2; Sat, 15 Jan 2022 10:02:13 +0800 (CST) References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> <86lf1njad0.fsf@163.com> <86ilw4e6av.fsf@163.com> <87y23mheag.fsf_-_@gmail.com> <86pmoyrxyy.fsf@163.com> <190ec030edbca1c16fb030c51acd60ffc6bae269.camel@telenet.be> <86zgo0nsgf.fsf@163.com> <86pmoucl3g.fsf@163.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Maxime Devos Subject: Re: [bug#51747] [PATCH]: gnu: nix: Update to 2.4. Date: Sat, 15 Jan 2022 09:58:38 +0800 In-reply-to: Message-ID: <86o84dah9i.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: G9xpCgCnrjIkK+JhgGGJAA--.24516S2 X-Coremail-Antispam: 1Uf129KBjvdXoWrur47GF17ZFyxZF4Utw1fZwb_yoWDXrbE9F WDCFWkJa45ZwsrJFykAr4fAFs7W3y5ury8ZF4Ivr13G3sYvrn5JFZ7urWF9FnFkan5tFnF krs3Xr1UtrsF9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7xRNxhLUUUUUU== X-Originating-IP: [163.125.202.182] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBZgaJr1aD+xqsRQAAsb X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51747 Cc: Oleg Pykhalov , 51747@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Maxime Devos writes: > [[PGP Signed Part:Undecided]] > Zhu Zihao schreef op za 15-01-2022 om 00:51 [+0800]: >> Patches updated. >>=20 >> The test is disabled by default, when I tried enable it test it fails, >> It looks like that the RPATH of test binary is not complete. Just leave >> it disabled. > > I didn't see anyting RUNPATH (*) related. It failed to run some python > script though with =E2=80=98file does not exist=E2=80=99 (which could may= be indicate > RUNPATH problems, but not in this case), it turned out that the shebang > wasn't patched. Adding python to the native-inputs appears to fix > things I use -K to keep failed build and ldd the test binary found that RUNPATH is broken, but I miss that we don't add python into inputs.. Penny wise and pound foolish LOL. I know Guix use RUNPATH, but RPATH is short to type and we need not to distinguish between them in our context.=20 =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYeIrGRUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/nJCAEAyVP0+5itTtfPnIUzna3k70r+7oko CfJYiH+wlgrybBsBAKHtTz7EU55vv7nHx7P3zqe0vJPu4SGneYkarnwXW0AF =OCfL -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 15 00:49:12 2022 Received: (at 51747) by debbugs.gnu.org; 15 Jan 2022 05:49:12 +0000 Received: from localhost ([127.0.0.1]:38784 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8bvy-0007X9-OI for submit@debbugs.gnu.org; Sat, 15 Jan 2022 00:49:12 -0500 Received: from mail-m972.mail.163.com ([123.126.97.2]:44478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8bvt-0007WS-UI for 51747@debbugs.gnu.org; Sat, 15 Jan 2022 00:49:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=oyqLb 9A6Bn/DjigSMvNVChgwhX03pmYp0NGTlsiIpnA=; b=biriq3yLBXs+e61D40EbO G6SRhBgJCNtA7L622uBw/ZHfA3ziN9SQgPPQ1VcHACbxbyZ4asZSqgGSCRK7bcwK HoE7vhIZarhus9tVRgWtlDnNuMc9ed3bh6QL1KCY+OW4yMW47n2vPLLO2q2Zz7AF WTPzB3zlpEX+z1ZJ+MB4lw= Received: from asus-laptop (unknown [27.38.116.36]) by smtp2 (Coremail) with SMTP id GtxpCgDXpws+YOJhYOWgAA--.6805S2; Sat, 15 Jan 2022 13:48:47 +0800 (CST) References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> <86lf1njad0.fsf@163.com> <86ilw4e6av.fsf@163.com> <87y23mheag.fsf_-_@gmail.com> <86pmoyrxyy.fsf@163.com> <190ec030edbca1c16fb030c51acd60ffc6bae269.camel@telenet.be> <86zgo0nsgf.fsf@163.com> <86pmoucl3g.fsf@163.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Maxime Devos Subject: Re: [bug#51747] [PATCH]: gnu: nix: Update to 2.4. Date: Sat, 15 Jan 2022 13:47:31 +0800 In-reply-to: Message-ID: <86bl0da6rn.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-CM-TRANSID: GtxpCgDXpws+YOJhYOWgAA--.6805S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4RJnYwDUUUU X-Originating-IP: [27.38.116.36] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiFBKJr1aD+6WFkgAAs8 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51747 Cc: Oleg Pykhalov , 51747@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Do some modification based on your code, and add your credit. --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYeJgPBUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/kaGwEA7JdFQb0PAs6zkmntMEZs7gEvi+I5 S1rp166YY6+eo3gA/Rk6S1U1IpZ4lMYsmr5dCJXO2aNwjqZvuetUV/qNOrwB =dbDk -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-Add-libcpuid.patch Content-Transfer-Encoding: quoted-printable >From 11e87c57046292b754c7d641b587e9eb99e688f7 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 11 Jan 2022 22:56:14 +0800 Subject: [PATCH 1/6] gnu: Add libcpuid. * gnu/packages/hardware.scm (libcpuid): New variable. --- gnu/packages/hardware.scm | 56 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 8727f0f20a..a93db0be3f 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -9,6 +9,8 @@ ;;; Copyright =C2=A9 2021 Raghav Gururajan ;;; Copyright =C2=A9 2021 Vinicius Monego ;;; Copyright =C2=A9 2021, 2022 John Kehayias +;;; Copyright =C2=A9 2022 Zhu Zihao +;;; Copyright =C2=A9 2022 Maxime Devos ;;; ;;; This file is part of GNU Guix. ;;; @@ -70,7 +72,8 @@ (define-module (gnu packages hardware) #:use-module (guix svn-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) - #:use-module (guix utils)) + #:use-module (guix utils) + #:use-module (srfi srfi-1)) =20 ;; This is a module for packages related to physical hardware that don't (= yet) ;; have a more specific home like gps.scm, security-token.scm, &c. @@ -953,3 +956,54 @@ (define-public tpm2-tss libtss2-esys, libtss2-sys, libtss2-mu, libtss2-tcti-device, libtss2-tcti-s= wtpm and libtss2-tcti-mssim.") (license license:bsd-2))) + +(define-public libcpuid + ;; We need to remove blobs from the source, first we have to isolate the= blob + ;; source in build system. + ;; See https://github.com/anrieff/libcpuid/pull/159. + (let ((commit "2e61160983f32ba840b2246d3c3850c44626ab0d") + (revision "1")) + (package + (name "libcpuid") + (version (git-version "0.5.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/anrieff/libcpuid") + (commit commit))) + (sha256 + (base32 "1mphvkiqq6z33sq6i490fq27sbyylacwrf8bg7ccvpcjms208sww")) + (modules '((guix build utils))) + (snippet + ;; Now remove blobs. + #~(begin + (delete-file "libcpuid/msrdriver.c") + (delete-file-recursively "contrib/MSR Driver"))) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DLIBCPUID_TESTS=3DON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'absolutize + (lambda* (#:key inputs #:allow-other-keys) + ;; Linux specific + (when #$(target-linux?) + (substitute* "libcpuid/rdmsr.c" + (("modprobe") (which "modprobe"))))))))) + (inputs + (if (target-linux?) + (list kmod) + '())) + (native-inputs (list python-3)) ;required by tests + (supported-systems + (filter (lambda (t) (or (target-x86-64? t) (target-x86-32? t))) + %supported-systems)) + (home-page "https://libcpuid.sourceforge.net/") + (synopsis "Small library for x86 CPU detection and feature extractio= n") + (description "Libcpuid is a small C library to get vendor, model, br= anding +string, code name and other information from x86 CPU. This library is not = to be +confused with the @code{cpuid} command line utility from package @code{cpu= id}.") + (license license:bsd-2)))) --=20 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-lowdown-Update-to-0.10.0-1-1de10c1.patch >From 28913dfe0c3041469ca3e2fbc93a600fb9c07656 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 11 Jan 2022 23:01:38 +0800 Subject: [PATCH 2/6] gnu: lowdown: Update to 0.10.0-1-1de10c1. * gnu/packages/markup.scm (lowdown): Update to 0.10.0-1-1de10c1. --- gnu/packages/markup.scm | 60 ++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 5f2f525cd2..563ad1e8e1 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -119,34 +119,40 @@ (define-public markdown "See License.text in the distribution.")))) (define-public lowdown - (package - (name "lowdown") - (version "0.10.0") - (source - (origin - (method url-fetch) - (uri (string-append "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-" - version ".tar.gz")) - (sha256 - (base32 "15v2kk4ffqw3n6y6n9plch4qcib3ynnhw0ih8wn2v9qgn4jssp5p")))) - (build-system gnu-build-system) - (arguments - `(#:test-target "regress" - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "./configure" - (string-append "PREFIX=" out) - (string-append "MANDIR=" out "/share/man")))))))) - (native-inputs - (list which)) - (home-page "https://kristaps.bsd.lv/lowdown/") - (synopsis "Simple Markdown translator") - (description "Lowdown is a Markdown translator producing HTML5, + (let ((commit "1de10c1d71bfb4348ae0beaec8b1547d5e114969") + (revision "1")) + (package + (name "lowdown") + (version (git-version "0.10.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kristapsdz/lowdown") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1wh07nkiihvp1m79sj4qlnqklnn0rfp3hwls8sqcp0bfd96wpa1h")))) + (build-system gnu-build-system) + (arguments + `(#:test-target "regress" + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "./configure" + (string-append "PREFIX=" out) + (string-append "MANDIR=" out "/share/man")))))) + #:make-flags '("CFLAGS=-fPIC")))) + + (native-inputs + (list which)) + (home-page "https://kristaps.bsd.lv/lowdown/") + (synopsis "Simple Markdown translator") + (description "Lowdown is a Markdown translator producing HTML5, roff documents in the ms and man formats, LaTeX, gemini, and terminal output.") - (license license:isc))) + (license license:isc)))) (define-public discount (package -- 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0003-gnu-lowdown-Use-G-expression.patch >From 7147a2c254e8010905fa2f02459618d28bdf7a75 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 12 Jan 2022 00:52:25 +0800 Subject: [PATCH 3/6] gnu: lowdown: Use G-expression. * gnu/packages/markup.scm(lowdown)[arguments]: Convert to G-expression. --- gnu/packages/markup.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/markup.scm b/gnu/packages/markup.scm index 563ad1e8e1..7a776b9101 100644 --- a/gnu/packages/markup.scm +++ b/gnu/packages/markup.scm @@ -29,6 +29,7 @@ (define-module (gnu packages markup) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix gexp) #:use-module (guix packages) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) @@ -135,17 +136,16 @@ (define-public lowdown (base32 "1wh07nkiihvp1m79sj4qlnqklnn0rfp3hwls8sqcp0bfd96wpa1h")))) (build-system gnu-build-system) (arguments - `(#:test-target "regress" - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "./configure" - (string-append "PREFIX=" out) - (string-append "MANDIR=" out "/share/man")))))) - #:make-flags '("CFLAGS=-fPIC")))) - + (list + #:test-target "regress" + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda _ + (invoke "./configure" + (string-append "PREFIX=" #$output) + (string-append "MANDIR=" #$output "/share/man"))))) + #:make-flags #~(list "CFLAGS=-fPIC"))) (native-inputs (list which)) (home-page "https://kristaps.bsd.lv/lowdown/") -- 2.34.0 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0004-gnu-nix-Update-to-2.4.patch Content-Transfer-Encoding: quoted-printable >From 045c1997bd21341606bfb5d4ae8104b8464dc60e Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Tue, 11 Jan 2022 23:10:01 +0800 Subject: [PATCH 4/6] gnu: nix: Update to 2.4. * gnu/packages/package-management.scm (nix): Update to 2.4. [source]: Switch to Github repository since upstream no longer provides tarball. [native-inputs]: Add autoconf, autoconf-archive, automake, bison, flex, gcc, googletest, jq, libtool. [inputs]: Add libarchive, libcpuid, lowdown, zlib. * gnu/packages/patches/nix-dont-build-html-doc.diff: New file. * gnu/local.mk(dist_patch_DATA): Add corresponding entry. --- gnu/local.mk | 1 + gnu/packages/package-management.scm | 66 +++++++++++++------ .../patches/nix-dont-build-html-doc.diff | 26 ++++++++ 3 files changed, 73 insertions(+), 20 deletions(-) create mode 100644 gnu/packages/patches/nix-dont-build-html-doc.diff diff --git a/gnu/local.mk b/gnu/local.mk index feadac4bad..9284212f01 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1515,6 +1515,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/nettle-3.5-check-_pkcs1_sec_decrypt-msg-len.patch \ %D%/packages/patches/nettle-3.5-CVE-2021-3580-pt1.patch \ %D%/packages/patches/nettle-3.5-CVE-2021-3580-pt2.patch \ + %D%/packages/patches/nix-dont-build-html-doc.diff \ %D%/packages/patches/nfs4-acl-tools-0.3.7-fixpaths.patch \ %D%/packages/patches/ngircd-handle-zombies.patch \ %D%/packages/patches/ngless-unliftio.patch \ diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-man= agement.scm index 8a4f5155ed..03f741dc2c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -20,6 +20,7 @@ ;;; Copyright =C2=A9 2021 Ivan Gankevich ;;; Copyright =C2=A9 2021 Maxim Cournoyer ;;; Copyright =C2=A9 2021 John Kehayias +;;; Copyright =C2=A9 2022 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -62,6 +63,8 @@ (define-module (gnu packages package-management) #:use-module (gnu packages dbm) #:use-module (gnu packages docbook) #:use-module (gnu packages file) + #:use-module (gnu packages flex) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -70,6 +73,7 @@ (define-module (gnu packages package-management) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) + #:use-module (gnu packages hardware) #:use-module (gnu packages hurd) #:use-module (gnu packages imagemagick) #:use-module (gnu packages less) @@ -77,6 +81,7 @@ (define-module (gnu packages package-management) #:use-module (gnu packages linux) #:use-module (gnu packages lisp) #:use-module (gnu packages man) + #:use-module (gnu packages markup) #:use-module (gnu packages nettle) #:use-module (gnu packages networking) #:use-module (gnu packages ninja) @@ -657,14 +662,18 @@ (define-public guix-icons (define-public nix (package (name "nix") - (version "2.3.16") - (source (origin - (method url-fetch) - (uri (string-append "https://releases.nixos.org/nix/nix-" - version "/nix-" version ".tar.xz")) - (sha256 - (base32 - "1g5aqavr6i3c1xln53w1pdh1kvlxrpnknb105m4jbd85kyv83rky")))) + (version "2.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "http://github.com/NixOS/nix") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1abgfw5ndqklm0x533li32l4azifz3f6lhaxm6s74b704043r7m2")) + (patches + (search-patches "nix-dont-build-html-doc.diff")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--sysconfdir=3D/etc" "--enable-gc") @@ -680,18 +689,35 @@ (define-public nix (string-append "sysconfdir=3D" etc) (string-append "profiledir=3D" etc "/profile.d") make-flags))))))) - (native-inputs (list pkg-config)) - (inputs (list boost - brotli - bzip2 - curl - editline - libgc - libseccomp - libsodium - openssl - sqlite - xz)) + (native-inputs + (list autoconf + autoconf-archive + automake + bison + flex + googletest + jq + libtool + pkg-config)) + (inputs + (append (list boost + brotli + bzip2 + curl + editline + libarchive + libgc + libseccomp + libsodium + lowdown + openssl + sqlite + xz + zlib) + (if (or (target-x86-64?) + (target-x86-32?)) + (list libcpuid) + '()))) (home-page "https://nixos.org/nix/") (synopsis "The Nix package manager") (description diff --git a/gnu/packages/patches/nix-dont-build-html-doc.diff b/gnu/packag= es/patches/nix-dont-build-html-doc.diff new file mode 100644 index 0000000000..79142bc215 --- /dev/null +++ b/gnu/packages/patches/nix-dont-build-html-doc.diff @@ -0,0 +1,26 @@ +"--enable-doc-gen" configure flag will enable HTML document generation tha= t requires mdbook. +We can't simply disable it because we need manpages. + +Author: Zhu Zihao + +diff --git a/doc/manual/local.mk b/doc/manual/local.mk +index e43d9f2fb..c323d1847 100644 +--- a/doc/manual/local.mk ++++ b/doc/manual/local.mk +@@ -69,8 +69,6 @@ $(d)/builtins.json: $(bindir)/nix + $(trace-gen) $(dummy-env) NIX_PATH=3Dnix/corepkgs=3Dcorepkgs $(bindir)/n= ix __dump-builtins > $@.tmp + @mv $@.tmp $@ +=20 +-# Generate the HTML manual. +-install: $(docdir)/manual/index.html +=20 + # Generate 'nix' manpages. + install: $(mandir)/man1/nix3-manpages +@@ -94,7 +92,5 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/comman= d-ref/new-cli + done + @touch $@ +=20 +-$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/custom.cs= s $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/command-ref/con= f-file.md $(d)/src/expressions/builtins.md $(call rwildcard, $(d)/src, *.md) +- $(trace-gen) RUST_LOG=3Dwarn mdbook build doc/manual -d $(DESTDIR)$(docd= ir)/manual +=20 + endif --=20 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0005-gnu-nix-Use-G-expression.patch >From 2e6281516a3d909c2b031f1a7461f27801c032f4 Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Wed, 12 Jan 2022 00:42:32 +0800 Subject: [PATCH 5/6] gnu: nix: Use G-expression. * gnu/packages/package-management.scm (nix)[arguments]: Convert to G-expression. --- gnu/packages/package-management.scm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 03f741dc2c..594d6e9d4b 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -676,19 +676,19 @@ (define-public nix (search-patches "nix-dont-build-html-doc.diff")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--sysconfdir=/etc" "--enable-gc") - #:phases - (modify-phases %standard-phases - (replace 'install - ;; Don't try & fail to create subdirectories in /etc, but keep them - ;; in the output as examples. - (lambda* (#:key (make-flags '()) outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (etc (string-append out "/etc"))) - (apply invoke "make" "install" - (string-append "sysconfdir=" etc) - (string-append "profiledir=" etc "/profile.d") - make-flags))))))) + (list + #:configure-flags #~(list "--sysconfdir=/etc" "--enable-gc") + #:phases + #~(modify-phases %standard-phases + (replace 'install + ;; Don't try & fail to create subdirectories in /etc, but keep them + ;; in the output as examples. + (lambda* (#:key (make-flags '()) outputs #:allow-other-keys) + (let ((etc (string-append #$output "/etc"))) + (apply invoke "make" "install" + (string-append "sysconfdir=" etc) + (string-append "profiledir=" etc "/profile.d") + make-flags))))))) (native-inputs (list autoconf autoconf-archive -- 2.34.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0006-gnu-nix-Update-to-2.5.1.patch >From a8ff6088e543f5a7322180aa59e7c4d5447eb11c Mon Sep 17 00:00:00 2001 From: Zhu Zihao Date: Fri, 14 Jan 2022 17:30:22 +0800 Subject: [PATCH 6/6] gnu: nix: Update to 2.5.1. * gnu/packages/package-management.scm(nix): Update to 2.5.1. --- gnu/packages/package-management.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 594d6e9d4b..9882f0a411 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -662,7 +662,7 @@ (define-public guix-icons (define-public nix (package (name "nix") - (version "2.4") + (version "2.5.1") (source (origin (method git-fetch) @@ -671,7 +671,7 @@ (define-public nix (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1abgfw5ndqklm0x533li32l4azifz3f6lhaxm6s74b704043r7m2")) + (base32 "1m8rmv8i6lg83pmalvjlq1fn8mcghn3ngjv3kw1kqsa45ymj5sqq")) (patches (search-patches "nix-dont-build-html-doc.diff")))) (build-system gnu-build-system) -- 2.34.0 --=-=-= Content-Type: text/plain -- Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 15 05:52:29 2022 Received: (at 51747) by debbugs.gnu.org; 15 Jan 2022 10:52:29 +0000 Received: from localhost ([127.0.0.1]:39189 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8gfc-0002KO-Ud for submit@debbugs.gnu.org; Sat, 15 Jan 2022 05:52:29 -0500 Received: from albert.telenet-ops.be ([195.130.137.90]:54522) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8gfb-0002KF-7P for 51747@debbugs.gnu.org; Sat, 15 Jan 2022 05:52:28 -0500 Received: from [172.20.10.5] ([188.188.185.222]) by albert.telenet-ops.be with bizsmtp id iysQ2600j4oKcDo06ysQoX; Sat, 15 Jan 2022 11:52:25 +0100 Message-ID: <0cb528695857acda121e58dee76b1095634ea7bb.camel@telenet.be> Subject: Re: [bug#51747] [PATCH]: gnu: nix: Update to 2.4. From: Maxime Devos To: Zhu Zihao Date: Sat, 15 Jan 2022 11:52:19 +0100 In-Reply-To: <86bl0da6rn.fsf@163.com> References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> <86lf1njad0.fsf@163.com> <86ilw4e6av.fsf@163.com> <87y23mheag.fsf_-_@gmail.com> <86pmoyrxyy.fsf@163.com> <190ec030edbca1c16fb030c51acd60ffc6bae269.camel@telenet.be> <86zgo0nsgf.fsf@163.com> <86pmoucl3g.fsf@163.com> <86bl0da6rn.fsf@163.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-nbRT66l/CPoap8F/sBmt" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1642243945; bh=IPBqd4xkguwEHdbIU5agBN4FTBzAm/DVhdhtJR2btRw=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=Y34J3We9r8+9WgfyOcvtYsFNwp4t3btYFj7gLUOx70fNwsLPZjTyjXV3e/WSwykbX NM4K12vTqqK3hIXExuS07NmRJk1Z/q2GtGLAWLxSjsLujjURkczkWiuwjw/pExrKV5 XWJEM3X+uzvXkmR6HSWSOwHpxPlmRerKpjd+iSbQzXlwHWPw8kZinEWeN4DZyuxSu9 Zn+E+aNj84zduxc2GeLC1RIOKVo/VmL40CupnqiPPvR7RnjJN+9lfxz9vcyfMmUiQa fVqhHbKQ28noilLSwpjqOemvA6p3qeQrt94PNCFE7FO84pS1KsKNlDmkW3grxpVd6i zbPI5paSv9OYg== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 51747 Cc: Oleg Pykhalov , 51747@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-nbRT66l/CPoap8F/sBmt Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi, I looked a bit in the source code, and it seems to be missing some error checking. E.g., in libcpuid/cpuid_main.c:, it is not verified that 'malloc' succeeded. list->names =3D (char**) malloc(sizeof(char*) * n); [...] list->names[n] =3D (char*) malloc (i - last) [....] list->names[n][i - last - 1 =3D '\0'] It doesn't seem exploitable here, but I would recommend something like 'xmalloc' instead to avoid (anti-)learning by bad examples. Also, in the package definition, you are using cmake-build-system. This works, but the README doesn't mention CMake anywhere and instead mentions the autotools (autoconf etc.) and has configure.ac, so I would use gnu-build-system instead. Zhu Zihao schreef op za 15-01-2022 om 13:47 [+0800]: > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (arguments > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (list > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #:configure-flags #~(list "-D= LIBCPUID_TESTS=3DON") > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #:phases > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #~(modify-phases %standard-ph= ases > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (add-= after 'unpack 'absolutize > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 (lambda* (#:key inputs #:allow-other-keys) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 ;; Linux specific > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0 (when #$(target-linux?) > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (substitute* "libcpuid/rdmsr.c" > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 (("modprobe") (which "modprobe")= )))))))) This use of 'which' doesn't work when cross-compiling because it looks in $PATH (which contains (possibly implicit) native-inputs) and not 'inputs' -- 'inputs' and 'native-inputs' are merged together when compiling natively so this doesn't cause errors when compiling natively but it doesn't work when cross-compiling -- try "./pre-inst-env guix build libcpuid --target=3Daarch64-linux-gnu". I would use 'search-input-file' instead: ;; using (when #$(target-linux? ...) ...) instead ;; of 'guard' would also work #~(modify-phases %standard-phases (add-after 'unpack 'absolutize (lambda* (#:key inputs #:allow-other-keys) ;; modprobe doesn't exist on the Hurd=20 (guard (c ((search-error? c) (values))) (substitute* "libcpuid/rdmsr.c" (("modprobe") (search-input-file inputs "bin/modprobe"))))))))) > + confused with the @code{cpuid} command line utility from package > + @code{cpuid}.") A definite article is missing before 'package'. > + (native-inputs (list python-3)) ;required by tests I would keep the original comment ;; a python from the 3. series is required by tests here, because it is important that it comes from the 3. series -- the shebang uses "/usr/bin/env python3", not "python3". This comment would be helpful when updating python to the 4. series (these versions don't exist yet but presumably they eventually will), as it would make it clear that we cannot simply replace 'python-3' with 'python-4'. Greetings, Maxime. --=-nbRT66l/CPoap8F/sBmt Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYeKnYxccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7jTiAP9tz223exwQ8XEuUlo9UxVOSQ3V jlenKR+InbQAFjTkLAD9HtBDDYber/Sn9+CdrRGY5SFZXKBOAI0cdoJqwgTysA8= =VW7/ -----END PGP SIGNATURE----- --=-nbRT66l/CPoap8F/sBmt-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 15 11:10:17 2022 Received: (at 51747) by debbugs.gnu.org; 15 Jan 2022 16:10:17 +0000 Received: from localhost ([127.0.0.1]:41583 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8ldA-0006Am-Sw for submit@debbugs.gnu.org; Sat, 15 Jan 2022 11:10:17 -0500 Received: from mail-m973.mail.163.com ([123.126.97.3]:21188) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8ld7-0006AH-6x for 51747@debbugs.gnu.org; Sat, 15 Jan 2022 11:10:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=zujum I3alFjEh6aStZn8s396fNXZVZ091OvM+8Do7vY=; b=ZMaum71OulaJLJWdsKCZj /V31q0OMylukt6OkrLGrpSyZjMhCRyKcNts60G458uxYdZOIicVdTeZ5suoDZmMR jdjUfhH+dW03b578taSTjF6ISF6iJ0a0azx3VceOAqk2T2pqPAp3h4N1kic4j4iP VhMF7a7XHE1CVw92QSDay0= Received: from asus-laptop (unknown [163.125.202.182]) by smtp3 (Coremail) with SMTP id G9xpCgDn7THZ8eJhVHziAA--.12219S2; Sun, 16 Jan 2022 00:10:02 +0800 (CST) References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> <86lf1njad0.fsf@163.com> <86ilw4e6av.fsf@163.com> <87y23mheag.fsf_-_@gmail.com> <86pmoyrxyy.fsf@163.com> <190ec030edbca1c16fb030c51acd60ffc6bae269.camel@telenet.be> <86zgo0nsgf.fsf@163.com> <86pmoucl3g.fsf@163.com> <86bl0da6rn.fsf@163.com> <0cb528695857acda121e58dee76b1095634ea7bb.camel@telenet.be> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao To: Maxime Devos Subject: Re: [bug#51747] [PATCH]: gnu: nix: Update to 2.4. Date: Sun, 16 Jan 2022 00:06:38 +0800 In-reply-to: <0cb528695857acda121e58dee76b1095634ea7bb.camel@telenet.be> Message-ID: <868rvh3rqv.fsf@163.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-CM-TRANSID: G9xpCgDn7THZ8eJhVHziAA--.12219S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4RyUDGUUUUU X-Originating-IP: [163.125.202.182] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBaxqJr1et2zVA4gAAsh X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51747 Cc: Oleg Pykhalov , 51747@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Maxime Devos writes: Please forgive me that I don't have so much time to test cross build. If you have problem with my patches, you can modify it based on existing patches. And don't forget to notice Guix committers to ensure they don't miss any new patches. :) =2D-=20 Retrieve my PGP public key: gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F Zihao --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIsEARYIADMWIQRefA5qkqvnKdl/GTlmOX+E92aT+QUCYeLxyBUcYWxsX2J1dF9s YXN0QDE2My5jb20ACgkQZjl/hPdmk/napAD+MYZvv/Eewh4QvreQzrlyauka5uYl u13LeEErr2IztwgA/RZw25CTTWlAzHS1MS+E4WPEQ6lISVELboZ8T9j2dHcG =INAD -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 21 09:31:45 2022 Received: (at 51747-done) by debbugs.gnu.org; 21 Jan 2022 14:31:45 +0000 Received: from localhost ([127.0.0.1]:60802 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nAux7-0005J8-Aa for submit@debbugs.gnu.org; Fri, 21 Jan 2022 09:31:45 -0500 Received: from mail-lf1-f42.google.com ([209.85.167.42]:46658) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nAux2-0005Ir-2b for 51747-done@debbugs.gnu.org; Fri, 21 Jan 2022 09:31:43 -0500 Received: by mail-lf1-f42.google.com with SMTP id d3so34174686lfv.13 for <51747-done@debbugs.gnu.org>; Fri, 21 Jan 2022 06:31:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=xjq8fVYUJ5qP+2ffh+06Gc//oMQ9LW+tKLhCbJsSdqE=; b=OxpFWQ4AFLnmMy8uqelaHHzYwAUuTf9FaId5ZX+vPtWQugp48VmjqMpgF+NC+m2E9O aJj3sqDm4x/udq7nCkRgMBBLO+C2txvb8902tfhZYkKe1FogiDugU6b9sBR9xclEjGiP +JVrxd4G3RLzD4S7HUGztEKGzpepNxUCcfSYmq11aN3sjMO2mhrVdHuMXE7TfOH4zA+Y LgBned8mGdUmOWaYueT8IJLAaj8wOKY/AgAlUGM/ZFetfvLOu7aMrqcIG7EYQNhHflNH lGWsVCUNSDem1mubX+kdPfloChevNQbF+gv6//V9ceG9A5Iwn96l909AKhG3ObxqpbBp uHlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=xjq8fVYUJ5qP+2ffh+06Gc//oMQ9LW+tKLhCbJsSdqE=; b=SKioP5fZVsGgnoWY5KIlk+BDEP9MLihTyIYW4cjzBFZtq02NG+Z2b9hRZwbWv4lL9M 6DrqiMtkp8b0FzFtHr81wBGFplT4WmaiaMFQ+TUD5PoPmtS2S570dkBa2x+HQJImb0p4 VQDNw4WBaWWi06DlOXwh6ynqr8IDbG4uYkG3HL7HE3lXXA9YEWxDmzhFZJvCYQ2SyVLu KZy8LrEPv35o6rOF3D3TqU2SUjiuUit+qMUTeZ4e01/ib/+p16vq0KiA+k/m3NQEcSTy tKpUAHADJdp4Vevg+LBg5Ic1eV3Li8POiR/bC1J+0skVzXp09QRldG6IkxiksPWqHDyg nf3Q== X-Gm-Message-State: AOAM532g90PMhHBJbUwmjTjAI4zBRxD8aibKKHIrWS0cMYM8+SN1PqGW lcUsMQHLeMByg79/99J8ScvFyUeeluU= X-Google-Smtp-Source: ABdhPJya8wpNieSW9vlzCeyCqFro7bwcJitxWXjpGYewk2bHdxABD89g1jY2C0Pjeg8Y6I53asK7Hw== X-Received: by 2002:ac2:5a59:: with SMTP id r25mr4086432lfn.34.1642775493630; Fri, 21 Jan 2022 06:31:33 -0800 (PST) Received: from guixsd ([88.201.161.72]) by smtp.gmail.com with ESMTPSA id be31sm272788lfb.46.2022.01.21.06.31.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 06:31:32 -0800 (PST) From: Oleg Pykhalov To: Zhu Zihao Subject: Re: bug#51747: [PATCH]: gnu: nix: Update to 2.4. References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> <86lf1njad0.fsf@163.com> <86ilw4e6av.fsf@163.com> <87y23mheag.fsf_-_@gmail.com> <86pmoyrxyy.fsf@163.com> <190ec030edbca1c16fb030c51acd60ffc6bae269.camel@telenet.be> <86zgo0nsgf.fsf@163.com> <86pmoucl3g.fsf@163.com> <86bl0da6rn.fsf@163.com> <0cb528695857acda121e58dee76b1095634ea7bb.camel@telenet.be> <868rvh3rqv.fsf@163.com> Date: Fri, 21 Jan 2022 17:29:53 +0300 In-Reply-To: <868rvh3rqv.fsf@163.com> (Zhu Zihao's message of "Sun, 16 Jan 2022 00:06:38 +0800") Message-ID: <8735lh5fha.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 51747-done Cc: 51747-done@debbugs.gnu.org, Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Zhu Zihao writes: > Maxime Devos writes: > > Please forgive me that I don't have so much time to test cross build. If > you have problem with my patches, you can modify it based on existing > patches. And don't forget to notice Guix committers to ensure they don't > miss any new patches. :) Pushed to master. Closing the issue. Thanks, Oleg. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQJIBAEBCgAyFiEEcjhxI46s62NFSFhXFn+OpQAa+pwFAmHqw2EUHGdvLndpZ3Vz dEBnbWFpbC5jb20ACgkQFn+OpQAa+pzyLg/9HxrgZBr3FaZhCvoNZknELOr1Xsw8 I7G1wAEty+rGW76xDccaF+C9BzTgAmREVTmmrvfVHbP/NoklzZjsMSRxQMjRYmUw QRXtr8UbvpE+LWvgPU05DFZ64QExRhYFXyCMkqs+tZKMMRA4SepCoN4SRYpYPh2h e2VBp3xUNaC8sJmKd3KBmOZAr4k2jMB35sovHtmgYyUPGW/WjS5fMshSbBuV7ffS Q7TPLH2CXJQcr1tFqC5/vrIyAu2AN1jXk8rnG1atZox382roPrPwS0qFjqh0xnfb N7HclQEoyAOhKbM6J1oQpMq2laC0fzsmhQTlnUu3oBHpnwgstOoS5Uv0KT/czo2t JYc1CjXZIeBdpxMeH06+s9fV2x8F+/Ufe7T3F3Ib5+nOyhklD7418rwwygEScZuL /koVcdDNJiyeQuwmAG0lFbxyZG6a80Jalp8umU+XQQYnW+Wjs6Zz7t+M7/bYRZg1 x80dBtKLfsDTq15ZK2iHb1VGC9O/lRZhDoFP+7zdWjftlEuJpck8JF6SFHBwAmyG GxMOsXzAQUjHnKbNExnHCWtEc3YmhlKdy+JGKxAZHma4LZPsacyVKrkpuLAcfHm3 MY5vdkpzJIHa1YxYdcAXND7gxwck0QvWdx5PkgMDIwtepJhkU9ocQJXbP41y6zoq fLIOQbF3KsrjaPI= =Gj4C -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 23 06:02:07 2022 Received: (at 51747) by debbugs.gnu.org; 23 Jan 2022 11:02:07 +0000 Received: from localhost ([127.0.0.1]:38613 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nBadL-00056L-L2 for submit@debbugs.gnu.org; Sun, 23 Jan 2022 06:02:07 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:44196) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nBadJ-00056C-5U for 51747@debbugs.gnu.org; Sun, 23 Jan 2022 06:02:05 -0500 Received: from ptr-bvsjgyhxw7psv60dyze.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by xavier.telenet-ops.be with bizsmtp id mB24260034UW6Th01B240N; Sun, 23 Jan 2022 12:02:04 +0100 Message-ID: <52358f3d22650fb57542d005307c5547c078b06d.camel@telenet.be> Subject: Re: [bug#51747] [PATCH]: gnu: nix: Update to 2.4. From: Maxime Devos Date: Sun, 23 Jan 2022 12:02:03 +0100 In-Reply-To: <0cb528695857acda121e58dee76b1095634ea7bb.camel@telenet.be> References: <86sfw4chme.fsf@163.com> <864k8kcdzu.fsf@163.com> <861r3oau4u.fsf@163.com> <86lf1njad0.fsf@163.com> <86ilw4e6av.fsf@163.com> <87y23mheag.fsf_-_@gmail.com> <86pmoyrxyy.fsf@163.com> <190ec030edbca1c16fb030c51acd60ffc6bae269.camel@telenet.be> <86zgo0nsgf.fsf@163.com> <86pmoucl3g.fsf@163.com> <86bl0da6rn.fsf@163.com> <0cb528695857acda121e58dee76b1095634ea7bb.camel@telenet.be> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-/e5UBJPeyKqa6+3bpz3/" User-Agent: Evolution 3.38.3-1 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1642935724; bh=F6+bJeQeyDFxtqx9m9q8WWVnhB2kgdPC9aS8VGoFlOk=; h=Subject:From:Cc:Date:In-Reply-To:References; b=Je4/C7ayjanYc43lK3jLan6IzmgpRWggySG/6NauFmoA9xLShvS80k3AXh9lrScq7 pwbFd8sPaANdcN9j/X1qqEJmdks33NAueToZkfW/qOZLI+c2CLBrC3DGOXsHVNFTt6 6lrKPHxO4HOk7n82Zyn8dgxoD05f0iY1b+dPPX150XNIomPeJJBF42rbO9zRoOqcWn W3mt1PfPJYqC/VJrdMsyWmj51uVER2Zi9r1Zh+4DzXU9V1BhFK08m+XfzxIfsT4fNp X0fjjOuVOWKJQnAz8MZ5EXCofH22SgxdBw5Ao0MBn42SCFu78kQS+ykgUZXXxQvIek 7V2GU3S1ZXcvQ== X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 51747 Cc: 51747@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) --=-/e5UBJPeyKqa6+3bpz3/ Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Maxime Devos schreef op za 15-01-2022 om 11:52 [+0100]: > I looked a bit in the source code, and it seems to be missing > some error checking.=C2=A0 E.g., in libcpuid/cpuid_main.c:, > it is not verified that 'malloc' succeeded. >=20 > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 list->names =3D (char**) mallo= c(sizeof(char*) * n); > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 [...] > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 list->names[n] =3D (char*) mal= loc (i - last) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 [....] > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 list->names[n][i - last - 1 = =3D '\0'] This has been addressed upstream: . Greetings, Maxime. --=-/e5UBJPeyKqa6+3bpz3/ Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYe01qxccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7gBBAP4pjMhnQIbsjp9hlL/on3QZenIe OgTU1fU/rgxCtWD6rwD/WDV9BOyo1jIvO9nDIELctE5Hz2fmhzQtKy+aFQzFcAk= =LMqo -----END PGP SIGNATURE----- --=-/e5UBJPeyKqa6+3bpz3/-- From unknown Fri Jun 20 07:27:49 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 20 Feb 2022 12:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator