From patchwork Fri Jan 14 16:51:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Zihao X-Patchwork-Id: 36327 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 B135D27BBE9; Fri, 14 Jan 2022 17:02:33 +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 D528027BBEA for ; Fri, 14 Jan 2022 17:02:31 +0000 (GMT) Received: from localhost ([::1]:54174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n8PyA-0006aB-VU for patchwork@mira.cbaines.net; Fri, 14 Jan 2022 12:02:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8Pu0-0002ic-9Q for guix-patches@gnu.org; Fri, 14 Jan 2022 11:58:14 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45082) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n8Ptq-0006Hq-6m for guix-patches@gnu.org; Fri, 14 Jan 2022 11:58:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n8Ptq-0006ds-7F for guix-patches@gnu.org; Fri, 14 Jan 2022 11:58: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 16:58: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.164217943025443 (code B ref 51747); Fri, 14 Jan 2022 16:58:02 +0000 Received: (at 51747) by debbugs.gnu.org; 14 Jan 2022 16:57:10 +0000 Received: from localhost ([127.0.0.1]:37979 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8Psr-0006bv-Qa for submit@debbugs.gnu.org; Fri, 14 Jan 2022 11:57:09 -0500 Received: from mail-m973.mail.163.com ([123.126.97.3]:51696) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8Psl-0006bR-Ap for 51747@debbugs.gnu.org; Fri, 14 Jan 2022 11:57:00 -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=hG3Zg 0ArAwNf6yrH3eaPKp27wGFTZCErlhSd+avt4qQ=; b=anm10f5o2cYFzxnKWg0mG MsGI7earyaWDEmraqKLEBYOC/+OMgGP7wvfaRwkJXKRFSYfmse2IePiyb9yR955U 3moXkmoJsOaS36M2cfdhyHF4TsuCAziXreFWbbcVZcDl176wrO0Q4YYMhW3VC4gr uQ1uFRFhMZAnUKOWxQZnS8= Received: from asus-laptop (unknown [163.125.202.182]) by smtp3 (Coremail) with SMTP id G9xpCgA3PTFLq+FhzYtdAA--.17400S2; Sat, 15 Jan 2022 00:56:44 +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> User-agent: mu4e 1.6.10; emacs 27.2 From: Zhu Zihao Date: Sat, 15 Jan 2022 00:51:29 +0800 In-reply-to: Message-ID: <86pmoucl3g.fsf@163.com> MIME-Version: 1.0 X-CM-TRANSID: G9xpCgA3PTFLq+FhzYtdAA--.17400S2 X-Coremail-Antispam: 1Uf129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvj4RgZ2TUUUUU X-Originating-IP: [163.125.202.182] X-CM-SenderInfo: pdoosuxxwbztlvw6il2tof0z/xtbBZgyIr1aD+xUpMgAAst 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. The test is disabled by default, when I tried enable it test it fails, It looks like that the RPATH of test binary is not complete. Just leave it disabled. I have no idea to give user a hint of differnce between cpuid and libcpuid. Maybe add a comment or add it to description. But I don't think user can find these hints in first sight. From d81e689fa1acd5eb4a2fee325609216a24a9b887 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