From patchwork Fri Mar 8 08:24:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aaron Covrig X-Patchwork-Id: 61521 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 7304A27BBEA; Fri, 8 Mar 2024 08:27:41 +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,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 DA78D27BBE2 for ; Fri, 8 Mar 2024 08:27:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1riVZn-0005YT-5s; Fri, 08 Mar 2024 03:27:35 -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 1riVZi-0005Xr-3b for guix-patches@gnu.org; Fri, 08 Mar 2024 03:27:31 -0500 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 1riVZh-0001mw-Rn for guix-patches@gnu.org; Fri, 08 Mar 2024 03:27:29 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1riVaD-0002ki-O6 for guix-patches@gnu.org; Fri, 08 Mar 2024 03:28:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69626] [PATCH rust-team v3] gnu: rust-ordered-float: Updated and added v4 References: <20240308051752.613660-1-aaron.covrig.us@ieee.org> In-Reply-To: <20240308051752.613660-1-aaron.covrig.us@ieee.org> Resent-From: Aaron Covrig Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Mar 2024 08:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69626 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69626@debbugs.gnu.org Cc: Aaron Covrig Received: via spool by 69626-submit@debbugs.gnu.org id=B69626.170988647910570 (code B ref 69626); Fri, 08 Mar 2024 08:28:01 +0000 Received: (at 69626) by debbugs.gnu.org; 8 Mar 2024 08:27:59 +0000 Received: from localhost ([127.0.0.1]:56510 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riVaA-0002kO-GM for submit@debbugs.gnu.org; Fri, 08 Mar 2024 03:27:59 -0500 Received: from mail-yw1-f182.google.com ([209.85.128.182]:57601) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1riVa7-0002k0-Sf for 69626@debbugs.gnu.org; Fri, 08 Mar 2024 03:27:57 -0500 Received: by mail-yw1-f182.google.com with SMTP id 00721157ae682-609f3ca61e0so15558577b3.3 for <69626@debbugs.gnu.org>; Fri, 08 Mar 2024 00:27:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ieee.org; s=google; t=1709886378; x=1710491178; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=VOWhllVD2Ywbo0S5iZOwIArvj9ebBY8aUu3leNAojYE=; b=YmYRnD2GhYpVS93DWMY/OrhILSUun4GByXklLi7PwVrJC6f2Q591cdDRHddPKOZTUT TsjaN+0jH/VxyQyGseJd8ymk3zFAXPzQd2mrIrHnGxsa/iJUy+i6oImwy2aeSZ+lTYPb 0frNhWlwhpKdWE+n6KvgKisvBTgwo2GZd9S0A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709886378; x=1710491178; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=VOWhllVD2Ywbo0S5iZOwIArvj9ebBY8aUu3leNAojYE=; b=EHie5o3lZxH1tyztoCW1ckXm1sjX4KvCUNPr+QYigzCUMQYdb10lAXmMx9gwUJUXKA /GEHxfbdc8wgK/Y/Klizg/R0gp5xNIQwCw1i1WwWmPXM5bdGNIysHUFL1NaXPoph9Peu m9Xu+ilAvCG/XmZcPGT/gfG//FuGCXAgUXcUNoaN6crOGfv3E+cXHbzA5RgEICxDD7nu HJzDifYZYceqYpWH7DMRqsDuMawYZwsR3w4QPIV5YADooaRVn50Nv1L0MqTMy/i5NooZ bg93vNxgJO/7HHygSXt83ioTjJNHeKKNat7oDiGr6Dzi0x296ewt0wSPEO8OFwWVg5MO TiiA== X-Gm-Message-State: AOJu0Yyjhu7ilDp4wzNsLHAgTZ2I9dcNLUCjlHBB73nqbZZU0H094w17 hKk3sysAjZugcps+YWsea8r7r4HeFgVOidQxljbxO/RiGYXYb75etypKiFF6aWh+pHdxicDllru xxaHpgPdngb0l2ocVfQC8uKqbfT87ewGtfk6IJqFJ3WYeQH+JY3N/1xEMdkhpBjgvnfOpTyL5Em UClTmL7Kd+2ZjE1u/2eshWEdTwZNd68WSslaEHXhr/rg== X-Google-Smtp-Source: AGHT+IHorXOOEIyaLzk/qJ4LDZvgvTskusUNeNmvh3sgxxYNj0LWvZk1zlpx7ERb+pNImQkuoh6/FA== X-Received: by 2002:a0d:c4c4:0:b0:609:748b:c346 with SMTP id g187-20020a0dc4c4000000b00609748bc346mr19484182ywd.49.1709886377627; Fri, 08 Mar 2024 00:26:17 -0800 (PST) Received: from localhost.localdomain (99-122-31-181.lightspeed.chtgtn.sbcglobal.net. [99.122.31.181]) by smtp.gmail.com with ESMTPSA id i13-20020a81be0d000000b00609d25c2476sm1470240ywn.32.2024.03.08.00.26.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Mar 2024 00:26:17 -0800 (PST) Date: Fri, 8 Mar 2024 03:24:06 -0500 Message-ID: <20240308082413.1187430-1-aaron.covrig.us@ieee.org> X-Mailer: git-send-email 2.41.0 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: Aaron Covrig X-ACL-Warn: , Aaron Covrig via Guix-patches X-Patchwork-Original-From: Aaron Covrig via Guix-patches via From: Aaron Covrig 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-ordered-float): Added v4.2.0 * gnu/packages/crates-io.scm (rust-ordered-float): Updated v3 to v3.9.2 and enabled building * gnu/packages/crates-io.scm (rust-ordered-float): Updated v2 to v2.10.1 and enabled building * gnu/packages/crates-io.scm (rust-ordered-float): Updated v1 to v1.1.1 and enabled building * gnu/packages/crates-io.scm (rust-schemars): Updated v0.8 to v0.8.16 * gnu/packages/crates-io.scm (rust-schemars-derive): Updated v0.8 to v0.8.16 * gnu/packages/crates-io.scm (rust-schemars): Added v0.6.5 * gnu/packages/crates-io.scm (rust-schemars-derive): Added v0.6.5 --- gnu/packages/crates-io.scm | 210 +++++++++++++++++++++++++------------ 1 file changed, 142 insertions(+), 68 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index aaf2157661..4358800129 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -41,6 +41,7 @@ ;;; Copyright © 2023, 2024 Troy Figiel ;;; Copyright © 2024 Herman Rimm ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz> +;;; Copyright © 2024 Aaron Covrig ;;; ;;; This file is part of GNU Guix. ;;; @@ -44046,71 +44047,98 @@ (define-public rust-ord-subset-3 PartialOrd types, like floats.") (license (list license:expat license:asl2.0)))) -(define-public rust-ordered-float-3 +(define-public rust-ordered-float-4 (package (name "rust-ordered-float") - (version "3.4.0") - (source (origin - (method url-fetch) - (uri (crate-uri "ordered-float" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1gr31ksgbqariv6hz3s5bc15a5vh4k65dyn8m7j59lhnji0b2knq")))) + (version "4.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ordered-float" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0kjqcvvbcsibbx3hnj7ag06bd9gv2zfi5ja6rgyh2kbxbh3zfvd7")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1) ("rust-bytemuck" ,rust-bytemuck-1) + ("rust-borsh" ,rust-borsh-1) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-proptest" ,rust-proptest-1) ("rust-rand" ,rust-rand-0.8) ("rust-rkyv" ,rust-rkyv-0.7) ("rust-schemars" ,rust-schemars-0.8) ("rust-serde" ,rust-serde-1) - ("rust-speedy" ,rust-speedy-0.8)))) + ("rust-speedy" ,rust-speedy-0.8)) + #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1)))) (home-page "https://github.com/reem/rust-ordered-float") (synopsis "Wrappers for total ordering on floats") (description "This package provides wrappers for total ordering on floats in Rust.") (license license:expat))) +(define-public rust-ordered-float-3 + (package + (inherit rust-ordered-float-4) + (name "rust-ordered-float") + (version "3.9.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "ordered-float" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1p3jkxlz89ndm4lmwr2n5kdnckhm5pcmqqkihkag259dff8c7qgi")))) + (arguments + `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1) + ("rust-bytemuck" ,rust-bytemuck-1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-proptest" ,rust-proptest-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-rkyv" ,rust-rkyv-0.7) + ("rust-schemars" ,rust-schemars-0.8) + ("rust-serde" ,rust-serde-1) + ("rust-speedy" ,rust-speedy-0.8)) + #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1)))))) + (define-public rust-ordered-float-2 (package (inherit rust-ordered-float-3) (name "rust-ordered-float") - (version "2.1.1") + (version "2.10.1") (source (origin (method url-fetch) (uri (crate-uri "ordered-float" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0632g8bacvras6nig1bb1ihgc560476jkrb3is6n542ll86q8vvn")))) + (base32 "075i108hr95pr7hy4fgxivib5pky3b6b22rywya5qyd2wmkrvwb8")))) (arguments - `(#:skip-build? - #t - #:cargo-inputs - (("rust-num-traits" ,rust-num-traits-0.2) - ("rust-serde" ,rust-serde-1)) - #:cargo-development-inputs - (("rust-serde-test" ,rust-serde-test-1)))))) + `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-proptest" ,rust-proptest-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-rkyv" ,rust-rkyv-0.7) + ("rust-schemars" ,rust-schemars-0.6) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1)))))) (define-public rust-ordered-float-1 (package (inherit rust-ordered-float-2) (name "rust-ordered-float") - (version "1.0.2") + (version "1.1.1") (source (origin (method url-fetch) (uri (crate-uri "ordered-float" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0625x96987kspdxbikry5mb7hsf5pdc5bbanxd8wjwqlx0ar71hq")))))) + (base32 "1drp3v9jsm1mn0wqp4p5y19j3bmz3w5rw4yxzi39zlld4wssy19k")))) + (arguments + `(#:cargo-inputs (("rust-num-traits" ,rust-num-traits-0.2) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1)))))) (define-public rust-ordered-multimap-0.3 (package @@ -58592,67 +58620,113 @@ (define-public rust-scheduled-thread-pool-0.2 (define-public rust-schemars-0.8 (package (name "rust-schemars") - (version "0.8.8") + (version "0.8.16") (source - (origin - (method url-fetch) - (uri (crate-uri "schemars" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1qvhq1yixygd8ihc0qxmnhw4x08fa44q88v088gvc6pa1k4a7df6")))) + (origin + (method url-fetch) + (uri (crate-uri "schemars" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0aadpjkaq7yl11b02pg4mwanylck328zg0q7w56dv6j89568z8j5")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-arrayvec" ,rust-arrayvec-0.5) - ("rust-bigdecimal" ,rust-bigdecimal-0.3) - ("rust-bytes" ,rust-bytes-1) - ("rust-chrono" ,rust-chrono-0.4) - ("rust-dyn-clone" ,rust-dyn-clone-1) - ("rust-either" ,rust-either-1) - ("rust-enumset" ,rust-enumset-1) - ("rust-indexmap" ,rust-indexmap-1) - ("rust-rust-decimal" ,rust-rust-decimal-1) - ("rust-schemars-derive" ,rust-schemars-derive-0.8) - ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-smallvec" ,rust-smallvec-1) - ("rust-url" ,rust-url-2) - ("rust-uuid" ,rust-uuid-0.8)) - #:cargo-development-inputs - (("rust-pretty-assertions" ,rust-pretty-assertions-0.6) - ("rust-trybuild" ,rust-trybuild-1)))) + `(#:cargo-inputs (("rust-arrayvec" ,rust-arrayvec-0.5) + ("rust-arrayvec" ,rust-arrayvec-0.7) + ("rust-bigdecimal" ,rust-bigdecimal-0.3) + ("rust-bigdecimal" ,rust-bigdecimal-0.4) + ("rust-bytes" ,rust-bytes-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-dyn-clone" ,rust-dyn-clone-1) + ("rust-either" ,rust-either-1) + ("rust-enumset" ,rust-enumset-1) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-rust-decimal" ,rust-rust-decimal-1) + ("rust-schemars-derive" ,rust-schemars-derive-0.8) + ("rust-semver" ,rust-semver-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-smol-str" ,rust-smol-str-0.1) + ("rust-url" ,rust-url-2) + ("rust-uuid" ,rust-uuid-0.8) + ("rust-uuid" ,rust-uuid-1)) + #:cargo-development-inputs (("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-trybuild" ,rust-trybuild-1)))) (home-page "https://graham.cool/schemars/") (synopsis "Generate JSON Schemas from Rust code") (description "This Rust library can help generating JSON Schemas from Rust code.") (license license:expat))) +(define-public rust-schemars-0.6 + (package + (inherit rust-schemars-0.8) + (name "rust-schemars") + (version "0.6.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "schemars" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1v6acgxkbhaw7fzg4mp09jv231f0mr224my629435wxasrrrfmh7")))) + (arguments + `(#:cargo-test-flags '("--" "--skip=doc_comments_struct") + #:cargo-inputs (("rust-arrayvec" ,rust-arrayvec-0.5) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-either" ,rust-either-1) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-schemars-derive" ,rust-schemars-derive-0.6) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-uuid" ,rust-uuid-0.8)) + #:cargo-development-inputs (("rust-pretty-assertions" ,rust-pretty-assertions-0.6)))))) + (define-public rust-schemars-derive-0.8 (package (name "rust-schemars-derive") - (version "0.8.8") + (version "0.8.16") (source - (origin - (method url-fetch) - (uri (crate-uri "schemars_derive" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "16xfvm16d8nsxdx82fdcyqfi12v61lffyf1wmi34qqg82g74vbj1")))) + (origin + (method url-fetch) + (uri (crate-uri "schemars_derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0rq9sdcf5hyvsyj9v9nfy2jgjbjzaldjq4i6y2fcz72xlrpzsry7")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quote" ,rust-quote-1) - ("rust-serde-derive-internals" ,rust-serde-derive-internals-0.25) - ("rust-syn" ,rust-syn-1)) - #:cargo-development-inputs - (("rust-pretty-assertions" ,rust-pretty-assertions-0.6)))) + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-serde-derive-internals" ,rust-serde-derive-internals-0.26) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs (("rust-pretty-assertions" ,rust-pretty-assertions-1)))) (home-page "https://graham.cool/schemars/") (synopsis "Macros for @code{#[derive(JsonSchema)]}, for use with schemars") - (description "This package provides macros for @code{#[derive(JsonSchema)]}, + (description + "This package provides macros for @code{#[derive(JsonSchema)]}, for use with schemars.") (license license:expat))) +(define-public rust-schemars-derive-0.6 + (package + (inherit rust-schemars-derive-0.8) + (name "rust-schemars-derive") + (version "0.6.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "schemars_derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1a9h8bqqqd0i6605gyhz2jw2hi1wq1vfi262qrflkn3pyk75wlrq")))) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-serde-derive-internals" ,rust-serde-derive-internals-0.25) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs (("rust-pretty-assertions" ,rust-pretty-assertions-0.6)))))) + (define-public rust-scoped-threadpool-0.1 (package (name "rust-scoped-threadpool")