From patchwork Fri Jan 14 09:31:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 36325 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 85C8827BBEA; Fri, 14 Jan 2022 09:34:15 +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 5F08727BBE9 for ; Fri, 14 Jan 2022 09:34:14 +0000 (GMT) Received: from localhost ([::1]:52322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n8IyL-0006un-IM for patchwork@mira.cbaines.net; Fri, 14 Jan 2022 04:34:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50160) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8IyA-0006tL-KV for guix-patches@gnu.org; Fri, 14 Jan 2022 04:34:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42734) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n8IyA-0006PS-AI for guix-patches@gnu.org; Fri, 14 Jan 2022 04:34:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n8IyA-00014V-8F for guix-patches@gnu.org; Fri, 14 Jan 2022 04:34: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: Fri, 14 Jan 2022 09:34: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.16421528174068 (code B ref 51747); Fri, 14 Jan 2022 09:34:02 +0000 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 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 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-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 Finally solve these issues, I hope. 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