From patchwork Wed Jan 12 15:27:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 36248 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 AB5D927BBEA; Wed, 12 Jan 2022 15:36:44 +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.5 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT, 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 30F7027BBE9 for ; Wed, 12 Jan 2022 15:36:44 +0000 (GMT) Received: from localhost ([::1]:46474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n7fg3-00040K-9f for patchwork@mira.cbaines.net; Wed, 12 Jan 2022 10:36:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59770) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n7fYo-0000l2-Do for guix-patches@gnu.org; Wed, 12 Jan 2022 10:29:14 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:37565) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n7fYn-0002Zh-VX for guix-patches@gnu.org; Wed, 12 Jan 2022 10:29:14 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n7fYn-0002L7-TW for guix-patches@gnu.org; Wed, 12 Jan 2022 10:29:13 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53208] [PATCH 31/39] gnu: Add rust-object-0.28. Resent-From: Z572 <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 12 Jan 2022 15:29:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53208 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53208@debbugs.gnu.org Received: via spool by 53208-submit@debbugs.gnu.org id=B53208.16420013288687 (code B ref 53208); Wed, 12 Jan 2022 15:29:13 +0000 Received: (at 53208) by debbugs.gnu.org; 12 Jan 2022 15:28:48 +0000 Received: from localhost ([127.0.0.1]:58654 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n7fYN-0002Fw-Fl for submit@debbugs.gnu.org; Wed, 12 Jan 2022 10:28:47 -0500 Received: from out203-205-251-85.mail.qq.com ([203.205.251.85]:60358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1n7fY1-0002AT-LW for 53208@debbugs.gnu.org; Wed, 12 Jan 2022 10:28:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1642001298; bh=9Waj4BmxxMmsB1BcbSf7kq4+dx6+RKZEEdkO4FTLpM8=; h=From:To:Subject:Date:In-Reply-To:References; b=UFHamko6xnNAAZod0ek5XAQ/FmQsOokU2e/KPxt0TjAgQDqfJxRhcjJneNcbhQ85g xV4Shs8Y/qBCF9W1p0LOAuhZsr5k0ExfIA7dvWLThAy+oeobmiZ9r/OehOS7efwkjS aVWo1SKSxh6s7VaFyKw7qbVa4xbNNbf7xnN0wQ8Q= Received: from localhost.localdomain ([112.10.216.34]) by newxmesmtplogicsvrsza5.qq.com (NewEsmtp) with SMTP id 6FB19A7A; Wed, 12 Jan 2022 23:27:59 +0800 X-QQ-mid: xmsmtpt1642001297tpe67ojxd Message-ID: X-QQ-XMAILINFO: NNehULFig4Nei7xjjYY0Hp/xtldFOBsJbxf2/xu9qZDLHdAFzLRvc56oxwjguQ Gp9QtjIjcQtY10IXQgYXXiE3zTGVfq36EZljpuu9WeBo3hOX14p+tQEgGxCvibAO/Zsc8X20wsTd fSTRngpV8mN8gQOVUmzOgX87GJxp3srNbOiPvKcPCyxajzEIn1BNd9UuKTNSmAUxJdntuatbl0wE 4PwYomJMnn3SqvdWUC9XsqQdspBrBvERS39CcSD6qbYtWbiYKWugDQgIh6UXu7on8D9CSloe8aPM ETbQWXIMedPXQwghvKyxD6pt6HjluROVLujafdF6builQwcjFoAHd7+2ZLQJCLnI1Nr9Igtf3p5z obRnf0ggT18aWZIr98a18uwwI8FYOumT5VD8UyNCCZa6YYU+haCe6gJdyd5TNyMfewq4WOvzCT8H qrjUYmidjFk7UH5ZrRhCcITUk4DsbJFNn4B0T9nbnevb0g+1GJuJmPNCuRbDL9uwenLhceAP/eG+ dX2MNP5ViNw72ssdpbZ18bOUrgKPXCZz3c7c97VAgESh1LH3BdAU8KdM4TcTWefRpIwrFAfV6r/x K+BnG1ByAiuoW4DuU7Afa/YUlth15dvLhOXtg3+thfVe04IZg/HnWSK4fWYHKx3a6/v59DxBcHRm uCVKVKROuNdzVrMxn65awPOLau22nOjxb7xcMTwPLbuDJM70GYE2Wc5FRPDkKM0rfQ1RiSAihPl0 1kfJkUu+BOZmCaML1LoBpqRW6OnRaVRCC+F3jcjRQXV4aCWQ2PR9yNPHGrccKaGoWXcGdKy7+uRt aiUnhQ6NgBkNHFnx7J99bMXU1UZLyPn1eicWM5m/FXT4IwsLou0eLF+EJofUjXtYB+HlxrkMo9// WUoXbovmE6 X-QQ-SPAM: true Date: Wed, 12 Jan 2022 23:27:51 +0800 X-OQ-MSGID: X-Mailer: git-send-email 2.34.0 In-Reply-To: References: 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" Reply-to: Z572 <873216071@qq.com> X-ACL-Warn: , Z572 via Guix-patches X-Patchwork-Original-From: Z572 via Guix-patches via From: Z572 <873216071@qq.com> X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-object-0.28): New variable. (rust-object-0.24): Inherit from above. --- gnu/packages/crates-io.scm | 49 ++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9dce8a07e4..8e4c6e6f47 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -35255,10 +35255,10 @@ (define-public rust-objc-test-utils-0.0 "This package provides utilities for testing Objective-C interop.") (license license:expat))) -(define-public rust-object-0.24 +(define-public rust-object-0.28 (package (name "rust-object") - (version "0.24.0") + (version "0.28.2") (source (origin (method url-fetch) @@ -35267,7 +35267,7 @@ (define-public rust-object-0.24 (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0w21hp41mixzaavsdpjylbylh44z2b5d2wbnf5ipkvkjq38ksnqs")))) + "1wgv6gx69rpn4jjqs24kvafwsic1q06iaafs5mb9hy34hp7c3x89")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -35276,14 +35276,24 @@ (define-public rust-object-0.24 ,rust-compiler-builtins-0.1) ("rust-crc32fast" ,rust-crc32fast-1) ("rust-flate2" ,rust-flate2-1) + ("rust-hashbrown" ,rust-hashbrown-0.11) ("rust-indexmap" ,rust-indexmap-1) + ("rust-memchr" ,rust-memchr-2) ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1) ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1) ("rust-wasmparser" ,rust-wasmparser-0.57)) #:cargo-development-inputs - (("rust-memmap" ,rust-memmap-0.7)))) + (("rust-memmap" ,rust-memmap-0.7)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-version-requirements + (lambda _ + (substitute* "Cargo.toml" + (("1.6.\\*") + ,(package-version rust-indexmap-1))) + #t))))) (home-page "https://github.com/gimli-rs/object") (synopsis "Unified interface for reading and writing object file formats") (description @@ -35291,6 +35301,37 @@ (define-public rust-object-0.24 file formats.") (license (list license:asl2.0 license:expat)))) +(define-public rust-object-0.24 + (package + (inherit rust-object-0.28) + (name "rust-object") + (version "0.24.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "object" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0w21hp41mixzaavsdpjylbylh44z2b5d2wbnf5ipkvkjq38ksnqs")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-compiler-builtins" + ,rust-compiler-builtins-0.1) + ("rust-crc32fast" ,rust-crc32fast-1) + ("rust-flate2" ,rust-flate2-1) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-rustc-std-workspace-alloc" + ,rust-rustc-std-workspace-alloc-1) + ("rust-rustc-std-workspace-core" + ,rust-rustc-std-workspace-core-1) + ("rust-wasmparser" ,rust-wasmparser-0.57)) + #:cargo-development-inputs + (("rust-memmap" ,rust-memmap-0.7)))))) + (define-public rust-object-0.23 (package (inherit rust-object-0.24)