From patchwork Tue Nov 29 07:00:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 44953 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 E6E8027BBEC; Tue, 29 Nov 2022 07:09:25 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham 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 DB12727BBEB for ; Tue, 29 Nov 2022 07:09:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozudD-00036t-BQ; Tue, 29 Nov 2022 02:02:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ozudA-00030q-8q for guix-patches@gnu.org; Tue, 29 Nov 2022 02:02:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ozud9-0003p1-V0 for guix-patches@gnu.org; Tue, 29 Nov 2022 02:02:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ozud8-0004q3-Qk for guix-patches@gnu.org; Tue, 29 Nov 2022 02:02:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59670] [PATCH 23/50] gnu: Add rust-windows-sys-0.42. Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Nov 2022 07:02:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59670 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59670@debbugs.gnu.org Cc: "\(" Received: via spool by 59670-submit@debbugs.gnu.org id=B59670.166970530518335 (code B ref 59670); Tue, 29 Nov 2022 07:02:10 +0000 Received: (at 59670) by debbugs.gnu.org; 29 Nov 2022 07:01:45 +0000 Received: from localhost ([127.0.0.1]:53706 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ozuci-0004lZ-EA for submit@debbugs.gnu.org; Tue, 29 Nov 2022 02:01:44 -0500 Received: from knopi.disroot.org ([178.21.23.139]:52774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ozucK-0004f3-IZ for 59670@debbugs.gnu.org; Tue, 29 Nov 2022 02:01:21 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 6D06E4143D; Tue, 29 Nov 2022 08:01:20 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7mV77BuTAHRs; Tue, 29 Nov 2022 08:01:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1669705275; bh=2jT2JG1JS+AZCHKCt9c122zudMAo6Nt2MaAJwaYYlsg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dNVZqaC+LrQsQKi+mqJ+D1lwm9HK/GJouBmISamfyU2ljQhZ6G8x75xARfTVlm8Dv C/01dwD3TUX+oNyO2kRc8BQvIBI8ExweJdL3nwEq8dDmfbaD6dPGuQqym6eDHJbR1R gsRn2OOopMbqHqVqLLKw/Pp+SBHKprKGdt+t7w3wbqSCqX8CTYavu2keC8MGqauoQH ZwzFW20MeTPdMx13erAeQyaYhG5Xu5yt+pIrdMFH8yw/StWNWQzKQar3AEJ7ccJYCG P+a6y1Vxcj5vIA4Hf/UHw5VRlC6vnam9W+O3QvBrH8xRwwcYHPqYPOo2igX9MAaMV1 xCrp5pv39MAqA== Date: Tue, 29 Nov 2022 07:00:37 +0000 Message-Id: <20221129070104.8007-23-paren@disroot.org> In-Reply-To: <20221129070104.8007-1-paren@disroot.org> References: <20221129070104.8007-1-paren@disroot.org> 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: , Reply-to: "\(" X-ACL-Warn: , "\( via Guix-patches" X-Patchwork-Original-From: "\( via Guix-patches" via From: "\\(" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crates-io.scm (rust-windows-sys-0.42): New variable. (rust-windows-sys-0.36): Inherit from RUST-WINDOWS-SYS-0.42. (rust-windows-sys-0.28): Inherit from RUST-WINDOWS-SYS-0.36. --- gnu/packages/crates-io.scm | 80 +++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 32 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index f9349d40da..24486206bd 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -67990,26 +67990,28 @@ (define-public rust-windows-implement-0.32 crate.") (license (list license:expat license:asl2.0)))) -(define-public rust-windows-sys-0.36 +(define-public rust-windows-sys-0.42 (package (name "rust-windows-sys") - (version "0.36.1") + (version "0.42.0") (source (origin (method url-fetch) (uri (crate-uri "windows-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1lmqangv0zg1l46xiq7rfnqwsx8f8m52mqbgg2mrx7x52rd1a17a")))) + "19waf8aryvyq9pzk0gamgfwjycgzk4gnrazpfvv171cby0h1hgjs")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-windows-aarch64-msvc" ,rust-windows-aarch64-msvc-0.36) - ("rust-windows-i686-gnu" ,rust-windows-i686-gnu-0.36) - ("rust-windows-i686-msvc" ,rust-windows-i686-msvc-0.36) - ("rust-windows-x86-64-gnu" ,rust-windows-x86-64-gnu-0.36) - ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.36)))) + (list #:skip-build? #t + #:cargo-inputs + `(("rust-windows-aarch64-gnullvm" ,rust-windows-aarch64-gnullvm-0.42) + ("rust-windows-aarch64-msvc" ,rust-windows-aarch64-msvc-0.42) + ("rust-windows-i686-gnu" ,rust-windows-i686-gnu-0.42) + ("rust-windows-i686-msvc" ,rust-windows-i686-msvc-0.42) + ("rust-windows-x86-64-gnu" ,rust-windows-x86-64-gnu-0.42) + ("rust-windows-x86-64-gnullvm" ,rust-windows-x86-64-gnullvm-0.42) + ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.42)))) (home-page "https://github.com/microsoft/windows-rs") (synopsis "Rust for Windows") (description "The windows crate lets you call any Windows API past, @@ -68018,33 +68020,47 @@ (define-public rust-windows-sys-0.36 if they were just another Rust module.") (license (list license:expat license:asl2.0)))) +(define-public rust-windows-sys-0.36 + (package + (inherit rust-windows-sys-0.42) + (name "rust-windows-sys") + (version "0.36.1") + (source (origin + (method url-fetch) + (uri (crate-uri "windows-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1lmqangv0zg1l46xiq7rfnqwsx8f8m52mqbgg2mrx7x52rd1a17a")))) + (arguments + (list #:skip-build? #t + #:cargo-inputs + `(("rust-windows-aarch64-msvc" ,rust-windows-aarch64-msvc-0.36) + ("rust-windows-i686-gnu" ,rust-windows-i686-gnu-0.36) + ("rust-windows-i686-msvc" ,rust-windows-i686-msvc-0.36) + ("rust-windows-x86-64-gnu" ,rust-windows-x86-64-gnu-0.36) + ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.36)))))) + (define-public rust-windows-sys-0.28 (package + (inherit rust-windows-sys-0.36) (name "rust-windows-sys") (version "0.28.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "windows-sys" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1xkghf343nll9i1yvha1a4spf53mnb5knzmnqj9adgsw5mh3kjl2")))) - (build-system cargo-build-system) + (source (origin + (method url-fetch) + (uri (crate-uri "windows-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1xkghf343nll9i1yvha1a4spf53mnb5knzmnqj9adgsw5mh3kjl2")))) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-windows-aarch64-msvc" ,rust-windows-aarch64-msvc-0.28) - ("rust-windows-i686-gnu" ,rust-windows-i686-gnu-0.28) - ("rust-windows-i686-msvc" ,rust-windows-i686-msvc-0.28) - ("rust-windows-x86-64-gnu" ,rust-windows-x86-64-gnu-0.28) - ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.28)))) - (home-page "https://github.com/microsoft/windows-rs") - (synopsis "Rust for Windows") - (description "The windows crate lets you call any Windows API past, -present, and future using code generated on the fly directly from the metadata -describing the API and right into your Rust package where you can call them as -if they were just another Rust module.") - (license (list license:expat license:asl2.0)))) + (list #:skip-build? #t + #:cargo-inputs + `(("rust-windows-aarch64-msvc" ,rust-windows-aarch64-msvc-0.28) + ("rust-windows-i686-gnu" ,rust-windows-i686-gnu-0.28) + ("rust-windows-i686-msvc" ,rust-windows-i686-msvc-0.28) + ("rust-windows-x86-64-gnu" ,rust-windows-x86-64-gnu-0.28) + ("rust-windows-x86-64-msvc" ,rust-windows-x86-64-msvc-0.28)))))) (define-public rust-windows-gen-0.9 (package