From patchwork Tue Jan 11 08:23:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Oleg Pykhalov X-Patchwork-Id: 36220 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 9E2F427BBEA; Tue, 11 Jan 2022 08:24:24 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 37B9227BBE9 for ; Tue, 11 Jan 2022 08:24:21 +0000 (GMT) Received: from localhost ([::1]:52522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7CS4-0002kk-6r for patchwork@mira.cbaines.net; Tue, 11 Jan 2022 03:24:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42590) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7CRm-0002kO-QU for guix-patches@gnu.org; Tue, 11 Jan 2022 03:24:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:32936) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7CRm-0001qS-Fl for guix-patches@gnu.org; Tue, 11 Jan 2022 03:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n7CRm-0001Pf-Dx for guix-patches@gnu.org; Tue, 11 Jan 2022 03:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51747] [PATCH]: gnu: nix: Update to 2.4. Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Jan 2022 08:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51747 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Zhu Zihao Cc: 51747@debbugs.gnu.org Received: via spool by 51747-submit@debbugs.gnu.org id=B51747.16418894125388 (code B ref 51747); Tue, 11 Jan 2022 08:24:02 +0000 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 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 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" X-getmail-retrieved-from-mailbox: Patches 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. From 00cc1e637a8b3a5a4b508673733c94b9f2bdcb40 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. --- 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 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -47,6 +47,7 @@ # Copyright © 2021 Dmitry Polyakov # Copyright © 2021 Andrew Tropin # Copyright © 2021 Simon Tournier +# Copyright © 2022 Zhu Zihao # # This file is part of GNU Guix. # @@ -1511,6 +1512,7 @@ dist_patch_DATA = \ %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-management.scm index 265763cc74..4b41c01dff 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2021 Ivan Gankevich ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 John Kehayias +;;; Copyright © 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.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--sysconfdir=/etc" "--enable-gc") @@ -680,18 +689,35 @@ (define-public nix (string-append "sysconfdir=" etc) (string-append "profiledir=" 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 + 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/packages/patches/nix-dont-build-html-doc.patch new file mode 100644 index 0000000000..79142bc215 --- /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 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 $@ + +-# Generate the HTML manual. +-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 + 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 + + endif -- 2.34.0