From patchwork Sat Apr 27 12:34:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 63430 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 7E24127BBEA; Sat, 27 Apr 2024 13:42:15 +0100 (BST) 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,MAILING_LIST_MULTI,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 9DF8B27BBE2 for ; Sat, 27 Apr 2024 13:42:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s0hNc-0006ZS-RO; Sat, 27 Apr 2024 08:42:12 -0400 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 1s0hNT-0006EJ-E1 for guix-patches@gnu.org; Sat, 27 Apr 2024 08:42:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s0hNS-0000kR-KF for guix-patches@gnu.org; Sat, 27 Apr 2024 08:42:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s0hNl-0005Jn-Bg; Sat, 27 Apr 2024 08:42:21 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70606] [PATCH rust-team 013/101] gnu: Place rust-spirv-types-0.4 in alphabetical order. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Sat, 27 Apr 2024 12:42:21 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70606 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70606@debbugs.gnu.org Cc: Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 70606-submit@debbugs.gnu.org id=B70606.171422169819842 (code B ref 70606); Sat, 27 Apr 2024 12:42:21 +0000 Received: (at 70606) by debbugs.gnu.org; 27 Apr 2024 12:41:38 +0000 Received: from localhost ([127.0.0.1]:39265 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s0hMz-000593-3b for submit@debbugs.gnu.org; Sat, 27 Apr 2024 08:41:37 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:53565 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s0hIr-0004FX-Mv for 70606@debbugs.gnu.org; Sat, 27 Apr 2024 08:37:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1714221396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DVqDHgDTI9+WaLK1Oc5+LmRwYNfzwK8IzGENvq2IE6Y=; b=rqXPvfqfvluaOoBXhG7U0iA5gTENSEmAqEBgRP+upIFXbvAe+vN4ThGbHD203lYCqk7tC6 YYHPtimE41D/ZryNMWnfzgyh1RE0wTDojkMuW6e3dN2dDmH33HdSGZOCOj0TrvZtuZ4jjg wFTiZzoo4IM/hfMxkiG1MCzL7gelFdb/igNBzU0/WOL46J7Cng2w10+rvdMKsAqec/tpw0 yn79UHr4+l+mcVDzDl3gA/uWrNXq3oJ/9U/bmCxPnufdGxYBLQ6xX+nxRbfkNQ0mq1PHRu YqFt/mopC+d1zYO0B5UAKGUZNn6qsfAjfUEev98rw1Fpmf/s2+6xZSTmZOkmnQ== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 66c550ba (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70606@debbugs.gnu.org>; Sat, 27 Apr 2024 12:36:36 +0000 (UTC) Date: Sat, 27 Apr 2024 14:34:35 +0200 Message-ID: <7f73ac2f52efeeca26b6b58a5914d9cdbc9f7a4a.1714220243.git.herman@rimm.ee> X-Mailer: git-send-email 2.41.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: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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-spirv-types-0.4, rust-spirv-std-0.4): Swap variables. Change-Id: I4701d99a269d9372b6b3efc99b4837878918947e --- gnu/packages/crates-io.scm | 62 +++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8a3cd15f78..b9257501b5 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -72347,23 +72347,31 @@ (define-public rust-spinning-top-0.2 provided by @code{lock_api}.") (license (list license:expat license:asl2.0)))) -(define-public rust-spirv-types-0.4 +(define-public rust-spirv-std-0.4 (package - (name "rust-spirv-types") - (version "0.4.0-alpha.12") + (name "rust-spirv-std") + ;; We use a slightly older version here, because of problems building glam + ;; 0.13.1 with more recent versions. + (version "0.4.0-alpha.7") (source (origin (method url-fetch) - (uri (crate-uri "spirv-types" version)) + (uri (crate-uri "spirv-std" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0sxcic2n04xzywww3c7mj9ah8iwr20vz3d6xvsgla1y7gs7lpk3i")))) + (base32 "14npd838bqnw09iab0zq94xs4yl69m6c0cdfzxa9fal0zxqlqv3j")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-spirv-std-macros" ,rust-spirv-std-macros-0.4) + ("rust-spirv-types" ,rust-spirv-types-0.4)))) (home-page "https://github.com/EmbarkStudios/rust-gpu") - (synopsis "SPIR-V types shared between spirv-std and spirv-std-macros") - (description "This package provides SPIR-V types shared between spirv-std -and spirv-std-macros.") + (synopsis "Standard functions and types for SPIR-V") + (description "This package provides standard functions and types for +SPIR-V.") (license (list license:expat license:asl2.0)))) (define-public rust-spirv-std-macros-0.4 @@ -72380,42 +72388,34 @@ (define-public rust-spirv-std-macros-0.4 (build-system cargo-build-system) (arguments `(#:skip-build? #t - #:cargo-inputs - (("rust-heck" ,rust-heck-0.3) - ("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quote" ,rust-quote-1) - ("rust-spirv-types" ,rust-spirv-types-0.4) - ("rust-syn" ,rust-syn-1)))) + #:cargo-inputs (("rust-heck" ,rust-heck-0.3) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-spirv-types" ,rust-spirv-types-0.4) + ("rust-syn" ,rust-syn-1)))) (home-page "https://github.com/EmbarkStudios/rust-gpu") (synopsis "Macros for spirv-std") (description "This package provides macros for spirv-std.") (license (list license:expat license:asl2.0)))) -(define-public rust-spirv-std-0.4 +(define-public rust-spirv-types-0.4 (package - (name "rust-spirv-std") - ;; We use a slightly older version here, because of problems building glam - ;; 0.13.1 with more recent versions. - (version "0.4.0-alpha.7") + (name "rust-spirv-types") + (version "0.4.0-alpha.12") (source (origin (method url-fetch) - (uri (crate-uri "spirv-std" version)) + (uri (crate-uri "spirv-types" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "14npd838bqnw09iab0zq94xs4yl69m6c0cdfzxa9fal0zxqlqv3j")))) + (base32 "0sxcic2n04xzywww3c7mj9ah8iwr20vz3d6xvsgla1y7gs7lpk3i")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-bitflags" ,rust-bitflags-1) - ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-spirv-std-macros" ,rust-spirv-std-macros-0.4) - ("rust-spirv-types" ,rust-spirv-types-0.4)))) + `(#:skip-build? #t)) (home-page "https://github.com/EmbarkStudios/rust-gpu") - (synopsis "Standard functions and types for SPIR-V") - (description "This package provides standard functions and types for -SPIR-V.") + (synopsis "SPIR-V types shared between spirv-std and spirv-std-macros") + (description "This package provides SPIR-V types shared between spirv-std +and spirv-std-macros.") (license (list license:expat license:asl2.0)))) (define-public rust-spmc-0.3