From patchwork Sun Oct 30 20:45:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 44203 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 3374F27BBEB; Sun, 30 Oct 2022 20:46:43 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,HTML_MESSAGE,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 C06F627BBE9 for ; Sun, 30 Oct 2022 20:46:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opFC5-0003Hn-Ab; Sun, 30 Oct 2022 16:46:09 -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 1opFC0-0003HX-Dh for guix-patches@gnu.org; Sun, 30 Oct 2022 16:46:05 -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 1opFBy-0002lE-PU for guix-patches@gnu.org; Sun, 30 Oct 2022 16:46:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1opFBy-0007dx-E1 for guix-patches@gnu.org; Sun, 30 Oct 2022 16:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58903] [PATCH] gnu: nix: Update to 2.11.1. Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 30 Oct 2022 20:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 58903 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58903@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.166716274329345 (code B ref -1); Sun, 30 Oct 2022 20:46:02 +0000 Received: (at submit) by debbugs.gnu.org; 30 Oct 2022 20:45:43 +0000 Received: from localhost ([127.0.0.1]:39076 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1opFBe-0007dE-Af for submit@debbugs.gnu.org; Sun, 30 Oct 2022 16:45:42 -0400 Received: from lists.gnu.org ([209.51.188.17]:53812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1opFBc-0007d7-Ij for submit@debbugs.gnu.org; Sun, 30 Oct 2022 16:45:41 -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 1opFBc-0003DU-CK for guix-patches@gnu.org; Sun, 30 Oct 2022 16:45:40 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1opFBZ-0002Z0-TJ for guix-patches@gnu.org; Sun, 30 Oct 2022 16:45:40 -0400 Date: Sun, 30 Oct 2022 20:45:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1667162727; x=1667421927; bh=YwkpG9Jj1s35Db3PJas8TZ/+NC51jLnGEbAUT2oobYg=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=jIqJnsWhDK0Y2neAEI3FgHbyPpvCt/8SPyLFkG6v2gXLk08qZCbFYQ9X060S/vIQ2 Omvjg/D0dJE5yU4Wr/e001bw53dhOpjj8LyGUVPRctrigr+djxz4i9vEqcD3ulwIBp eBHO2FNegs+SUfr1zgR9THNmCOql3Wh+I7jCn6k0yHVx6xo2OuRwXgS34orpRiViev 2fJyy/eACPN3SmS8hjeit0oQUGMk03GU5X5uy38+q298qHpIsw4Ed2uQ83qyK+Yhy/ EFUk/YqUo94hUEcsYJ8t/x+DfKbnRJ6ggK2gppF1PrqF/a1yRDnsQd61gFd2fDZcpG EIXxviuflThSw== Message-ID: <_Tae6WSRS-06CyA4U8PCmO0Lqyxwza7wI9dU_Bl2pWWpnABpRr0YBVBHRA65OmiL1hH4DZdhcuD1m4WsRw9coSVqmcvTXmIoyAn2mh0M1rg=@protonmail.com> Feedback-ID: 14143818:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.134; envelope-from=phodina@protonmail.com; helo=mail-40134.protonmail.ch 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, HTML_MESSAGE=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Sender: "Guix-patches" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi, here's update of Nix daemon. Unfortunately, there is one test that doesn't return the location '/nix/store' so it's substituted. ---- Petr From 6c9fe1aa54189afa36a85610e0a537581a495ad4 Mon Sep 17 00:00:00 2001 From: Petr Hodina Date: Sun, 30 Oct 2022 19:00:09 +0100 Subject: [PATCH] gnu: nix: Update to 2.11.1. * gnu/packages/package-management.scm (nix): New variable. * gnu/packages/patches/nix-dont-build-html-doc.diff: Update patch. diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 9872d99312..a0c741df1c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2021, 2022 Maxim Cournoyer ;;; Copyright © 2021 John Kehayias ;;; Copyright © 2022 Zhu Zihao +;;; Copyright © 2022 Petr Hodina ;;; ;;; This file is part of GNU Guix. ;;; @@ -56,6 +57,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) @@ -739,7 +741,7 @@ (define-public guix-modules (define-public nix (package (name "nix") - (version "2.5.1") + (version "2.11.1") (source (origin (method git-fetch) @@ -748,7 +750,7 @@ (define-public nix (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1m8rmv8i6lg83pmalvjlq1fn8mcghn3ngjv3kw1kqsa45ymj5sqq")) + (base32 "1sbl3fm3xcwcdf80xlfp743iw6pdx8rq8p272az03x1l9kk7l9d8")) (patches (search-patches "nix-dont-build-html-doc.diff")))) (build-system gnu-build-system) @@ -757,6 +759,11 @@ (define-public nix #:configure-flags #~(list "--sysconfdir=/etc" "--enable-gc") #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'fix-build + (lambda* _ + ;; FIXME: Disable failing ASSERT + (substitute* "src/libexpr/tests/primops.cc" + ((".*/nix/store.*") "")))) (replace 'install ;; Don't try & fail to create subdirectories in /etc, but keep them ;; in the output as examples. @@ -782,6 +789,7 @@ (define-public nix bzip2 curl editline + json-modern-cxx libarchive libgc libseccomp diff --git a/gnu/packages/patches/nix-dont-build-html-doc.diff b/gnu/packages/patches/nix-dont-build-html-doc.diff index 79142bc215..db110b80b8 100644 --- a/gnu/packages/patches/nix-dont-build-html-doc.diff +++ b/gnu/packages/patches/nix-dont-build-html-doc.diff @@ -1,26 +1,18 @@ -"--enable-doc-gen" configure flag will enable HTML document generation that 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=nix/corepkgs=corepkgs $(bindir)/nix __dump-builtins > $@.tmp - @mv $@.tmp $@ +--- a/doc/manual/local.mk 2022-10-30 18:52:44.091425741 +0100 ++++ b/doc/manual/local.mk 2022-10-30 18:53:00.026549841 +0100 +@@ -77,7 +77,6 @@ --# Generate the HTML manual. + # Generate the 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 +@@ -101,7 +100,5 @@ 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) +-$(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/command-ref/conf-file.md $(d)/src/language/builtins.md - $(trace-gen) RUST_LOG=warn mdbook build doc/manual -d $(DESTDIR)$(docdir)/manual endif -- 2.37.2