From patchwork Tue Jan 11 17:19:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 36229 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 2331627BBEA; Tue, 11 Jan 2022 17:40:40 +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_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 1599F27BBE9 for ; Tue, 11 Jan 2022 17:40:39 +0000 (GMT) Received: from localhost ([::1]:34310 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7L8Q-0001sQ-5x for patchwork@mira.cbaines.net; Tue, 11 Jan 2022 12:40:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38168) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7KpT-000827-3C for guix-patches@gnu.org; Tue, 11 Jan 2022 12:21:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34279) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7KpS-0000RP-PU for guix-patches@gnu.org; Tue, 11 Jan 2022 12:21:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n7KpS-0006tH-En for guix-patches@gnu.org; Tue, 11 Jan 2022 12:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51747] [PATCH]: gnu: nix: Update to 2.4. Resent-From: Zhu Zihao Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Jan 2022 17:21: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: Oleg Pykhalov Cc: 51747@debbugs.gnu.org Received: via spool by 51747-submit@debbugs.gnu.org id=B51747.164192163426417 (code B ref 51747); Tue, 11 Jan 2022 17:21:02 +0000 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 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 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-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 Patches updated. 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