From patchwork Sat Jan 15 05:47:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 36362 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 CB3A427BBEA; Sat, 15 Jan 2022 05:51:46 +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 04B6427BBE9 for ; Sat, 15 Jan 2022 05:51:45 +0000 (GMT) Received: from localhost ([::1]:52034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n8byZ-00012k-W0 for patchwork@mira.cbaines.net; Sat, 15 Jan 2022 00:51:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47576) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8bwx-00011E-IC for guix-patches@gnu.org; Sat, 15 Jan 2022 00:50:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45881) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n8bww-0008Sp-U6 for guix-patches@gnu.org; Sat, 15 Jan 2022 00:50:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n8bww-0007Yd-MC for guix-patches@gnu.org; Sat, 15 Jan 2022 00:50: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: Sat, 15 Jan 2022 05:50: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: Maxime Devos Cc: Oleg Pykhalov , 51747@debbugs.gnu.org Received: via spool by 51747-submit@debbugs.gnu.org id=B51747.164222575228977 (code B ref 51747); Sat, 15 Jan 2022 05:50:02 +0000 Received: (at 51747) by debbugs.gnu.org; 15 Jan 2022 05:49:12 +0000 Received: from localhost ([127.0.0.1]:38784 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8bvy-0007X9-OI for submit@debbugs.gnu.org; Sat, 15 Jan 2022 00:49:12 -0500 Received: from mail-m972.mail.163.com ([123.126.97.2]:44478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8bvt-0007WS-UI for 51747@debbugs.gnu.org; Sat, 15 Jan 2022 00:49:01 -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=oyqLb 9A6Bn/DjigSMvNVChgwhX03pmYp0NGTlsiIpnA=; b=biriq3yLBXs+e61D40EbO G6SRhBgJCNtA7L622uBw/ZHfA3ziN9SQgPPQ1VcHACbxbyZ4asZSqgGSCRK7bcwK HoE7vhIZarhus9tVRgWtlDnNuMc9ed3bh6QL1KCY+OW4yMW47n2vPLLO2q2Zz7AF WTPzB3zlpEX+z1ZJ+MB4lw= Received: from asus-laptop (unknown [27.38.116.36]) by smtp2 (Coremail) with SMTP id GtxpCgDXpws+YOJhYOWgAA--.6805S2; Sat, 15 Jan 2022 13:48:47 +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> <86pmoyrxyy.fsf@163.com> <190ec030edbca1c16fb030c51acd60ffc6bae269.camel@telenet.be> <86zgo0nsgf.fsf@163.com> <86pmoucl3g.fsf@163.com> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao Date: Sat, 15 Jan 2022 13:47:31 +0800 In-reply-to: Message-ID: <86bl0da6rn.fsf@163.com> MIME-Version: 1.0 X-CM-TRANSID: GtxpCgDXpws+YOJhYOWgAA--.6805S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4RJnYwDUUUU X-Originating-IP: [27.38.116.36] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/1tbiFBKJr1aD+6WFkgAAs8 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 Do some modification based on your code, and add your credit. From a8ff6088e543f5a7322180aa59e7c4d5447eb11c 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