From patchwork Sat Apr 27 12:35:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 63506 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 EB08527BBED; Sat, 27 Apr 2024 14:18:28 +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 E5FC427BBE2 for ; Sat, 27 Apr 2024 14:18:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s0hvr-0006YF-7T; Sat, 27 Apr 2024 09:17:35 -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 1s0hvh-0006Rz-H0 for guix-patches@gnu.org; Sat, 27 Apr 2024 09:17:26 -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 1s0hvg-0007GR-H8 for guix-patches@gnu.org; Sat, 27 Apr 2024 09:17:25 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s0hvy-0002Yw-Vb; Sat, 27 Apr 2024 09:17:42 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70606] [PATCH rust-team 097/101] gnu: Place rust-askama-0.11 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 13:17:42 +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.17142238479583 (code B ref 70606); Sat, 27 Apr 2024 13:17:42 +0000 Received: (at 70606) by debbugs.gnu.org; 27 Apr 2024 13:17:27 +0000 Received: from localhost ([127.0.0.1]:54909 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s0hvc-0002T6-7o for submit@debbugs.gnu.org; Sat, 27 Apr 2024 09:17:26 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:53325 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s0hKB-0004DC-W9 for 70606@debbugs.gnu.org; Sat, 27 Apr 2024 08:38:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1714221430; 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=2wKSLuNPpKQdEI/UR4gxV5FLyIcHG0kW5WpXI4aum4I=; b=mRI9BNe/Vbham66tg05lp0sWuK3Zp1nY7MR5L81HtpUHt9eDZlC1CPNltRlui260XPTLxV wKBs5ij5YvF3CX8USIz7SxunHnEesMBGtLzINhHTOkLglof6tZYgUdKmqUIq1X8/fRLl5t Ylj5JSPu/DUeUQ8L1XF5n51c5DOMqP5u+9s7l2ToZa7NFk5GizZR1pnH/nURXXqulx4Muo MOQA2AT3eca3Bl1BRdQHPXaoDMz8GMqZ9dI0k+sTo2bE3EFV6YF/PMSERtIG/l7oHPfoVI Fw22aHQ6SCc/aeMSFljKbgmCrPg5sQMXkE8aSdfPggPUyNmYpH6wiIdClzy9yg== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 9a6286fc (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO) for <70606@debbugs.gnu.org>; Sat, 27 Apr 2024 12:37:10 +0000 (UTC) Date: Sat, 27 Apr 2024 14:35:59 +0200 Message-ID: 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-askama-0.12, rust-askama-0.11, rust-askama-shared-0.12, rust-askama-escape-0.10): Swap variables. Change-Id: Ia6d51c8fe62d7f719cf9937a536d4b5ea86d1a66 --- gnu/packages/crates-io.scm | 146 ++++++++++++++++++------------------- 1 file changed, 73 insertions(+), 73 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index a44221572f..f3259d2b32 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -4109,61 +4109,53 @@ (define-public rust-asio-sys-0.2 "Low-level interface and binding generation for the Steinberg ASIO SDK.") (license license:asl2.0))) -(define-public rust-askama-escape-0.10 +(define-public rust-askama-0.12 (package - (name "rust-askama-escape") - (version "0.10.3") + (name "rust-askama") + (version "0.12.1") (source (origin (method url-fetch) - (uri (crate-uri "askama_escape" version)) + (uri (crate-uri "askama" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0hg3rz0cma5f6385z7qmqw3jbir76jndwd5s7dqfk92v9gil75v1")))) + (base32 "0a1cmp0f1b01zzbzzp81ppa6r754zpax5372aykswz5933gr345p")))) (build-system cargo-build-system) - (arguments (list #:skip-build? #t)) + (arguments + `(#:cargo-inputs (("rust-askama-derive" ,rust-askama-derive-0.12) + ("rust-askama-escape" ,rust-askama-escape-0.10) + ("rust-comrak" ,rust-comrak-0.18) + ("rust-humansize" ,rust-humansize-2) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-yaml" ,rust-serde-yaml-0.9)))) (home-page "https://github.com/djc/askama") - (synopsis "HTML escaping extracted from Askama") + (synopsis "Type-safe, compiled Jinja-like templates for Rust") (description - "This package provides an optimized HTML escaping library, -extracted from Askama.") + "This package provides a type-safe, compiled Jinja-like template +library for Rust.") (license (list license:expat license:asl2.0)))) -(define-public rust-askama-shared-0.12 +(define-public rust-askama-0.11 (package - (name "rust-askama-shared") - (version "0.12.2") - (source (origin - (method url-fetch) - (uri (crate-uri "askama_shared" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1l4fycmw65zyvfabf672sj2pc0ilfcj0y6a0csygq1wa26a2nwmz")))) - (build-system cargo-build-system) + (inherit rust-askama-0.12) + (name "rust-askama") + (version "0.11.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "askama" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0f81mzccdadryzaf2dbad1araq4nadp9mssyvdvv31hj6w7z367v")))) (arguments (list #:skip-build? #t #:cargo-inputs - `(("rust-askama-escape" ,rust-askama-escape-0.10) - ("rust-comrak" ,rust-comrak-0.12) - ("rust-humansize" ,rust-humansize-1) - ("rust-mime" ,rust-mime-0.3) - ("rust-mime-guess" ,rust-mime-guess-2) - ("rust-nom" ,rust-nom-7) - ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-percent-encoding" - ,rust-percent-encoding-2) - ("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quote" ,rust-quote-1) - ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-serde-yaml" ,rust-serde-yaml-0.8) - ("rust-syn" ,rust-syn-1) - ("rust-toml" ,rust-toml-0.5)))) - (home-page "https://github.com/djc/askama") - (synopsis "Shared code for Askama") - (description "This package provides shared code for Askama.") - (license (list license:expat license:asl2.0)))) + `(("rust-askama-derive" ,rust-askama-derive-0.11) + ("rust-askama-escape" ,rust-askama-escape-0.10) + ("rust-askama-shared" ,rust-askama-shared-0.12)))))) (define-public rust-askama-derive-0.12 (package @@ -4211,6 +4203,27 @@ (define-public rust-askama-derive-0.11 ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-syn" ,rust-syn-1)))))) +(define-public rust-askama-escape-0.10 + (package + (name "rust-askama-escape") + (version "0.10.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "askama_escape" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0hg3rz0cma5f6385z7qmqw3jbir76jndwd5s7dqfk92v9gil75v1")))) + (build-system cargo-build-system) + (arguments + (list + #:skip-build? #t)) + (home-page "https://github.com/djc/askama") + (synopsis "HTML escaping extracted from Askama") + (description "This package provides an optimized HTML escaping library, +extracted from Askama.") + (license (list license:expat license:asl2.0)))) + (define-public rust-askama-parser-0.2 (package (name "rust-askama-parser") @@ -4230,54 +4243,41 @@ (define-public rust-askama-parser-0.2 (description "Parser for Askama templates.") (license (list license:expat license:asl2.0)))) -(define-public rust-askama-0.12 +(define-public rust-askama-shared-0.12 (package - (name "rust-askama") - (version "0.12.1") + (name "rust-askama-shared") + (version "0.12.2") (source (origin (method url-fetch) - (uri (crate-uri "askama" version)) + (uri (crate-uri "askama_shared" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0a1cmp0f1b01zzbzzp81ppa6r754zpax5372aykswz5933gr345p")))) + (base32 "1l4fycmw65zyvfabf672sj2pc0ilfcj0y6a0csygq1wa26a2nwmz")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-askama-derive" ,rust-askama-derive-0.12) - ("rust-askama-escape" ,rust-askama-escape-0.10) - ("rust-comrak" ,rust-comrak-0.18) - ("rust-humansize" ,rust-humansize-2) + (list + #:skip-build? #t + #:cargo-inputs `(("rust-askama-escape" ,rust-askama-escape-0.10) + ("rust-comrak" ,rust-comrak-0.12) + ("rust-humansize" ,rust-humansize-1) + ("rust-mime" ,rust-mime-0.3) + ("rust-mime-guess" ,rust-mime-guess-2) + ("rust-nom" ,rust-nom-7) ("rust-num-traits" ,rust-num-traits-0.2) ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) - ("rust-serde-yaml" ,rust-serde-yaml-0.9)))) + ("rust-serde-yaml" ,rust-serde-yaml-0.8) + ("rust-syn" ,rust-syn-1) + ("rust-toml" ,rust-toml-0.5)))) (home-page "https://github.com/djc/askama") - (synopsis "Type-safe, compiled Jinja-like templates for Rust") - (description - "This package provides a type-safe, compiled Jinja-like template -library for Rust.") + (synopsis "Shared code for Askama") + (description "This package provides shared code for Askama.") (license (list license:expat license:asl2.0)))) -(define-public rust-askama-0.11 - (package - (inherit rust-askama-0.12) - (name "rust-askama") - (version "0.11.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "askama" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "0f81mzccdadryzaf2dbad1araq4nadp9mssyvdvv31hj6w7z367v")))) - (arguments - (list #:skip-build? #t - #:cargo-inputs - `(("rust-askama-derive" ,rust-askama-derive-0.11) - ("rust-askama-escape" ,rust-askama-escape-0.10) - ("rust-askama-shared" ,rust-askama-shared-0.12)))))) - (define-public rust-assert-0.7 (package (name "rust-assert")