From patchwork Sun Jun 4 16:43:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 50606 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6885627BBEA; Sun, 4 Jun 2023 17:45:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 75B4F27BBE2 for ; Sun, 4 Jun 2023 17:45:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q5qqm-0003Sk-2y; Sun, 04 Jun 2023 12:45:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q5qqk-0003SA-DK for guix-patches@gnu.org; Sun, 04 Jun 2023 12:45:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q5qqk-0003a7-4A for guix-patches@gnu.org; Sun, 04 Jun 2023 12:45:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q5qqk-0007Ms-0i for guix-patches@gnu.org; Sun, 04 Jun 2023 12:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63893] [PATCH 2/3] gnu: nix: Update to 2.16.0. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Jun 2023 16:45:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63893 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63893@debbugs.gnu.org Cc: Zhu Zihao Received: via spool by 63893-submit@debbugs.gnu.org id=B63893.168589708628265 (code B ref 63893); Sun, 04 Jun 2023 16:45:01 +0000 Received: (at 63893) by debbugs.gnu.org; 4 Jun 2023 16:44:46 +0000 Received: from localhost ([127.0.0.1]:47001 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5qqU-0007Lo-5X for submit@debbugs.gnu.org; Sun, 04 Jun 2023 12:44:46 -0400 Received: from m12.mail.163.com ([220.181.12.199]:38076) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q5qqQ-0007Lc-Td for 63893@debbugs.gnu.org; Sun, 04 Jun 2023 12:44:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version: Content-Type; bh=ZsRtjkHRgjnzD2OxmyzWD+YAvc8ugauDk0fr27AXFMU=; b=K/ZHvj/tgz21zkmZkueiSyeEdQehgtQv24mceI8d87P1yKeHqcF97CgeeztLEl RpVEqvxKThZiQv5dx0NVdlTwt1Khop+fwjouL1UFi2j9zblQg352PmBFKzyVXk5S cQwWNzPgwmFWD8xXTaAGdI3dKbCtVD/EtWXEftNo9ngrc= Received: from localhost.localdomain (unknown [218.18.128.204]) by zwqz-smtp-mta-g3-3 (Coremail) with SMTP id _____wAXH7dsv3xk_BQgBg--.39500S2; Mon, 05 Jun 2023 00:44:34 +0800 (CST) From: Zhu Zihao Date: Mon, 5 Jun 2023 00:43:46 +0800 Message-Id: <98e6750da44a63f49efedbeb602112552c496abc.1685896014.git.all_but_last@163.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <89f7dfb39f6e4010d962b392772409c756f0e562.1685896014.git.all_but_last@163.com> References: <89f7dfb39f6e4010d962b392772409c756f0e562.1685896014.git.all_but_last@163.com> MIME-Version: 1.0 X-CM-TRANSID: _____wAXH7dsv3xk_BQgBg--.39500S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxuFWDur4fCw4rKFW8KFWUCFg_yoW7Zr4xpF WYvryrKw4kGayrAw1xWr1Ikr43X3s7AF9Fy3WYvr13Aw4jgw48tr9Iyrs8AF17Wa1xAw4x Cayaq3yUCa4rtrJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pE4E_DUUUUU= X-Originating-IP: [218.18.128.204] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBaxeEr1et9FUKLgAAso X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/package-management.scm (nix): Update to 2.16.0. [inputs]: Add nlohmann-json. [native-inputs]: Add rapidcheck. [arguments]<#:phases>: In phase "check", change the value of environment variable "NIX_STORE" to "/nix/store" temporarily. * gnu/packages/patches/nix-dont-build-html-doc.diff: Update. --- gnu/packages/package-management.scm | 25 +++++++++++--- .../patches/nix-dont-build-html-doc.diff | 33 ++++++++++++++----- 2 files changed, 45 insertions(+), 13 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index a856ff2726..238914a955 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -20,7 +20,7 @@ ;;; Copyright © 2021 Ivan Gankevich ;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer ;;; Copyright © 2021 John Kehayias -;;; Copyright © 2022 Zhu Zihao +;;; Copyright © 2022, 2023 Zhu Zihao ;;; ;;; This file is part of GNU Guix. ;;; @@ -56,6 +56,7 @@ (define-module (gnu packages package-management) #:use-module (gnu packages compression) #:use-module (gnu packages cmake) #:use-module (gnu packages cpio) + #:use-module (gnu packages cpp) #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages databases) @@ -730,7 +731,7 @@ (define-public guix-modules (define-public nix (package (name "nix") - (version "2.5.1") + (version "2.16.0") (source (origin (method git-fetch) @@ -739,7 +740,7 @@ (define-public nix (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1m8rmv8i6lg83pmalvjlq1fn8mcghn3ngjv3kw1kqsa45ymj5sqq")) + (base32 "0jizpci4zspqpqqy3n780m4wh8dzhfywaiz953xv70c7in810dra")) (patches (search-patches "nix-dont-build-html-doc.diff")))) (build-system gnu-build-system) @@ -756,7 +757,19 @@ (define-public nix (apply invoke "make" "install" (string-append "sysconfdir=" etc) (string-append "profiledir=" etc "/profile.d") - make-flags))))))) + make-flags)))) + (replace 'check + (lambda args + ;; Some test expect environment variable NIX_STORE to be + ;; "/nix/store" + (let ((original-NIX_STORE (getenv "NIX_STORE"))) + (dynamic-wind + (lambda () + (setenv "NIX_STORE" "/nix/store")) + (lambda () + (apply (assoc-ref %standard-phases 'check) args)) + (lambda () + (setenv "NIX_STORE" original-NIX_STORE))))))))) (native-inputs (list autoconf autoconf-archive @@ -766,7 +779,8 @@ (define-public nix googletest jq libtool - pkg-config)) + pkg-config + rapidcheck)) (inputs (append (list boost brotli @@ -778,6 +792,7 @@ (define-public nix libseccomp libsodium lowdown + nlohmann-json openssl sqlite xz diff --git a/gnu/packages/patches/nix-dont-build-html-doc.diff b/gnu/packages/patches/nix-dont-build-html-doc.diff index 79142bc215..2eb45117b0 100644 --- a/gnu/packages/patches/nix-dont-build-html-doc.diff +++ b/gnu/packages/patches/nix-dont-build-html-doc.diff @@ -3,24 +3,41 @@ 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 +@@ -138,11 +138,6 @@ $(trace-gen) $(dummy-env) NIX_PATH=nix/corepkgs=corepkgs $(bindir)/nix __dump-builtins > $@.tmp @mv $@.tmp $@ -# Generate the HTML manual. +-.PHONY: manual-html +-manual-html: $(docdir)/manual/index.html -install: $(docdir)/manual/index.html - +- # Generate 'nix' manpages. install: $(mandir)/man1/nix3-manpages -@@ -94,7 +92,5 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli + man: doc/manual/generated/man1/nix3-manpages +@@ -167,23 +162,4 @@ done @touch $@ --$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/custom.css $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/command-ref/conf-file.md $(d)/src/expressions/builtins.md $(call rwildcard, $(d)/src, *.md) -- $(trace-gen) RUST_LOG=warn mdbook build doc/manual -d $(DESTDIR)$(docdir)/manual - +-$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/anchors.jq $(d)/custom.css $(d)/src/SUMMARY.md $(d)/src/command-ref/new-cli $(d)/src/contributing/experimental-feature-descriptions.md $(d)/src/command-ref/conf-file.md $(d)/src/language/builtins.md +- $(trace-gen) \ +- tmp="$$(mktemp -d)"; \ +- cp -r doc/manual "$$tmp"; \ +- find "$$tmp" -name '*.md' | while read -r file; do \ +- $(call process-includes,$$file,$$file); \ +- done; \ +- find "$$tmp" -name '*.md' | while read -r file; do \ +- docroot="$$(realpath --relative-to="$$(dirname "$$file")" $$tmp/manual/src)"; \ +- sed -i "s,@docroot@,$$docroot,g" "$$file"; \ +- done; \ +- set -euo pipefail; \ +- RUST_LOG=warn mdbook build "$$tmp/manual" -d $(DESTDIR)$(docdir)/manual.tmp 2>&1 \ +- | { grep -Fv "because fragment resolution isn't implemented" || :; }; \ +- rm -rf "$$tmp/manual" +- @rm -rf $(DESTDIR)$(docdir)/manual +- @mv $(DESTDIR)$(docdir)/manual.tmp/html $(DESTDIR)$(docdir)/manual +- @rm -rf $(DESTDIR)$(docdir)/manual.tmp +- endif