From patchwork Tue Nov 29 07:00:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "\\(" X-Patchwork-Id: 44905 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 9835E27BBEC; Tue, 29 Nov 2022 07:02:14 +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 9879327BBE9 for ; Tue, 29 Nov 2022 07:02:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ozud3-0002rl-AX; Tue, 29 Nov 2022 02:02:05 -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 1ozud2-0002r9-FK for guix-patches@gnu.org; Tue, 29 Nov 2022 02:02:04 -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 1ozud2-0003jo-4M for guix-patches@gnu.org; Tue, 29 Nov 2022 02:02:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ozud2-0004o9-19 for guix-patches@gnu.org; Tue, 29 Nov 2022 02:02:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59670] [PATCH 07/50] gnu: Add rust-askama-shared-0.12. Resent-From: "(" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Nov 2022 07:02:04 +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.166970529818215 (code B ref 59670); Tue, 29 Nov 2022 07:02:04 +0000 Received: (at 59670) by debbugs.gnu.org; 29 Nov 2022 07:01:38 +0000 Received: from localhost ([127.0.0.1]:53671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ozucb-0004je-KO for submit@debbugs.gnu.org; Tue, 29 Nov 2022 02:01:38 -0500 Received: from knopi.disroot.org ([178.21.23.139]:52634) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ozucE-0004er-C8 for 59670@debbugs.gnu.org; Tue, 29 Nov 2022 02:01:15 -0500 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 142B74144D; Tue, 29 Nov 2022 08:01:14 +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 aS6oLCAtBn2v; Tue, 29 Nov 2022 08:01:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1669705271; bh=M1+claYoo68dcjkMibDU5VIFR1iFt57O1xUe8qNtzNs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eSWby8MUbdwmvBr91ZPUL7GmigVyXbEICABx64APOh4E9po92Ic8nd/5ruhpptA4g ulr4uYLCqrZ0iQT6lqbLSfvut0DWvCtNsyFuYkRCSkGwDkK3jobzMs52JJ39m5HeSl 5uxViwpfHatiU/TuT+1DpxzYTjw7eQUBQqFxdWfoGtOfe1P0dclUoOWug71coULFA8 Q5dVkTzI+2hwl680YTgd5jF4JJHJth3RDvi8OGIHFHbjdetuR8dvoMuQ21jIj4B+HS Vci9cG9wyWRMeGxNIqW5KeUwWgQI9ESHABEmfu/eIKPudUwrqynd0lvgF9q97UiQ5h Vt3Fxqjv0ZLAw== Date: Tue, 29 Nov 2022 07:00:21 +0000 Message-Id: <20221129070104.8007-7-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-askama-shared-0.12): New variable. (rust-askama-shared-0.11): Inherit from RUST-ASKAMA-SHARED-0.12. --- gnu/packages/crates-io.scm | 86 +++++++++++++++++++++++++------------- 1 file changed, 58 insertions(+), 28 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 87e970eb80..b00727553e 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -3553,42 +3553,72 @@ (define-public rust-askama-escape-0.10 extracted from Askama.") (license (list license:expat license:asl2.0)))) -(define-public rust-askama-shared-0.11 +(define-public rust-askama-shared-0.12 (package (name "rust-askama-shared") - (version "0.11.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "askama_shared" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1g3ksf5is0qwx9rd5lxn5gbvxfcpby5gl9cahg26wl1w1xzbg0i5")))) + (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) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-askama-escape" ,rust-askama-escape-0.10) - ("rust-humansize" ,rust-humansize-1) - ("rust-nom" ,rust-nom-6) - ("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-derive" ,rust-serde-derive-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)))) + (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 a shared code for Askama.") + (description "This package provides shared code for Askama.") (license (list license:expat license:asl2.0)))) +(define-public rust-askama-shared-0.11 + (package + (inherit rust-askama-shared-0.12) + (name "rust-askama-shared") + (version "0.11.1") + (source (origin + (method url-fetch) + (uri (crate-uri "askama_shared" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1g3ksf5is0qwx9rd5lxn5gbvxfcpby5gl9cahg26wl1w1xzbg0i5")))) + (arguments + (list #:skip-build? #t + #:cargo-inputs + `(("rust-askama-escape" ,rust-askama-escape-0.10) + ("rust-humansize" ,rust-humansize-1) + ("rust-nom" ,rust-nom-6) + ("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-derive" ,rust-serde-derive-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)))))) + (define-public rust-askama-derive-0.10 (package (name "rust-askama-derive")