From patchwork Tue Jan 30 15:24:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 59580 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 1E43B27BBEA; Tue, 30 Jan 2024 15:27:55 +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_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,TVD_SPACE_RATIO,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 F37E127BBE2 for ; Tue, 30 Jan 2024 15:27:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rUq13-0002M1-2Y; Tue, 30 Jan 2024 10:27:13 -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 1rUq0m-0002Fg-Mm for guix-patches@gnu.org; Tue, 30 Jan 2024 10:26:57 -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 1rUq0m-00068E-EW for guix-patches@gnu.org; Tue, 30 Jan 2024 10:26:56 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rUq0v-0007fZ-C8; Tue, 30 Jan 2024 10:27:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68819] [PATCH 08/49] gnu: Replace rust-chrono-tz-0.6 with rust-chrono-tz-0.8. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, guix-patches@gnu.org Resent-Date: Tue, 30 Jan 2024 15:27:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68819 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68819@debbugs.gnu.org Cc: Herman Rimm , Efraim Flashner X-Debbugs-Original-Xcc: Efraim Flashner Received: via spool by 68819-submit@debbugs.gnu.org id=B68819.170662839129293 (code B ref 68819); Tue, 30 Jan 2024 15:27:05 +0000 Received: (at 68819) by debbugs.gnu.org; 30 Jan 2024 15:26:31 +0000 Received: from localhost ([127.0.0.1]:36189 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUq0L-0007c8-IR for submit@debbugs.gnu.org; Tue, 30 Jan 2024 10:26:30 -0500 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:33997 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rUq0F-0007Zl-IR for 68819@debbugs.gnu.org; Tue, 30 Jan 2024 10:26:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1706628368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=B/bxT3hQfoPdG5sUenHFqGz43cRsuwJ1TCWWew4chrI=; b=RTS9cNYXLhB/9sUqyY746GvtrmWTCvNVBed7MlTbxGwg1dLeKQ7JZ5B578rwcAvRHxsZry Iy4D/iE3aC4w42HkUFslxZriuDcSMlm2cBWcKb/+RqCUYgHiTKTt3QkcA1XBsogW/UVxvV vnq7AYBfpqjL3HX8CkR8Em8NnHsCel36u+kXWy2tyKwKmGuv24dSITp3BA+b92SpLCnSg0 aB8hkeu9QBlEsHb/KeSfTxzQlAySckeTV6nQf/CIJV8JstVcCx50/ferpxvf1r03peXwJW h9L+tU2Acs7JCwYh4j2mQ3wwbmdqkwvFyDIf2iwSc5GlJsbRuWA8EdGusoci4A== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 3db9b48c (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 30 Jan 2024 15:26:08 +0000 (UTC) Date: Tue, 30 Jan 2024 16:24:51 +0100 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-chrono-tz-0.8): Add variable. (rust-chrono-tz-0.6): Delete variable. (rust-chrono-tz-0.5): Inherit from rust-chrono-tz-0.8. (rust-tera-1): Use rust-chrono-tz-0.8 and substitute version. (rust-arrow2-0.7): Use rust-chrono-tz-0.8 and substitute version. Change-Id: I2b21e216469e5a192f38bda5fcaa25a8c2268741 --- gnu/packages/crates-io.scm | 51 ++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 8dc83e46a1..70af71362f 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -2584,7 +2584,7 @@ (define-public rust-arrow2-0.7 ("rust-avro-rs" ,rust-avro-rs-0.13) ("rust-base64" ,rust-base64-0.13) ("rust-chrono" ,rust-chrono-0.4) - ("rust-chrono-tz" ,rust-chrono-tz-0.6) + ("rust-chrono-tz" ,rust-chrono-tz-0.8) ("rust-comfy-table" ,rust-comfy-table-4) ("rust-csv" ,rust-csv-1) ("rust-futures" ,rust-futures-0.3) @@ -2608,7 +2608,14 @@ (define-public rust-arrow2-0.7 ("rust-simdutf8" ,rust-simdutf8-0.1) ("rust-streaming-iterator" ,rust-streaming-iterator-0.1) ("rust-strength-reduce" ,rust-strength-reduce-0.2) - ("rust-zstd" ,rust-zstd-0.9)))) + ("rust-zstd" ,rust-zstd-0.9)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-chrono-tz-version + (lambda* _ + (substitute* "Cargo.toml" + (("chrono-tz = \\{ version = \"0.6\"") + "chrono-tz = { version = \"0.8\""))))))) (home-page "https://github.com/jorgecarleitao/arrow2") (synopsis "Unofficial implementation of Apache Arrow spec in safe Rust") (description @@ -10054,33 +10061,29 @@ (define-public rust-chrono-humanize-0.2 Python @code{arrow.humanize}.") (license (list license:expat license:asl2.0)))) -(define-public rust-chrono-tz-0.6 +(define-public rust-chrono-tz-0.8 (package (name "rust-chrono-tz") - (version "0.6.3") + (version "0.8.5") (source (origin (method url-fetch) (uri (crate-uri "chrono-tz" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1pmv434fhw9pwiqc12pvgaiskrq4v1dh1f238gfsg48r301r5hr9")))) + (base32 "1dv0yqhr60wrhm4sdlralqw1jf5plcxc91q6v93hvamzk6gbgmwi")))) (build-system cargo-build-system) (arguments - `(#:cargo-test-flags - (list "--release" "--" - "--skip=tests::second_offsets") - #:cargo-inputs - (("rust-chrono" ,rust-chrono-0.4) - ("rust-chrono-tz-build" ,rust-chrono-tz-build-0.0.3) - ("rust-phf" ,rust-phf-0.11) - ("rust-serde" ,rust-serde-1) - ("rust-uncased" ,rust-uncased-0.9)) - #:cargo-development-inputs - (("rust-chrono" ,rust-chrono-0.4) - ("rust-serde-test" ,rust-serde-test-1)))) + `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-chrono-tz-build" ,rust-chrono-tz-build-0.2) + ("rust-phf" ,rust-phf-0.11) + ("rust-serde" ,rust-serde-1) + ("rust-uncased" ,rust-uncased-0.9)) + #:cargo-development-inputs (("rust-chrono" ,rust-chrono-0.4) + ("rust-serde-test" ,rust-serde-test-1)))) (home-page "https://github.com/chronotope/chrono-tz") - (synopsis "TimeZone implementations for rust-chrono from the IANA database") + (synopsis "TimeZone implementations for chrono from the IANA database") (description "Chrono-TZ is a library that provides implementors of the TimeZone trait for @code{rust-chrono}.") @@ -10088,7 +10091,7 @@ (define-public rust-chrono-tz-0.6 (define-public rust-chrono-tz-0.5 (package - (inherit rust-chrono-tz-0.6) + (inherit rust-chrono-tz-0.8) (name "rust-chrono-tz") (version "0.5.3") (source @@ -66539,7 +66542,7 @@ (define-public rust-tera-1 "--skip=tera::tests::can_load_from_glob") #:cargo-inputs (("rust-chrono" ,rust-chrono-0.4) - ("rust-chrono-tz" ,rust-chrono-tz-0.6) + ("rust-chrono-tz" ,rust-chrono-tz-0.8) ("rust-globwalk" ,rust-globwalk-0.8) ("rust-humansize" ,rust-humansize-2) ("rust-lazy-static" ,rust-lazy-static-1) @@ -66555,7 +66558,13 @@ (define-public rust-tera-1 #:cargo-development-inputs (("rust-pretty-assertions" ,rust-pretty-assertions-1) ("rust-serde-derive" ,rust-serde-derive-1) - ("rust-tempfile" ,rust-tempfile-3)))) + ("rust-tempfile" ,rust-tempfile-3)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-chrono-tz-version + (lambda* _ + (substitute* "Cargo.toml" + (("0.6.1") "0.8"))))))) (home-page "https://tera.netlify.com/") (synopsis "Template engine based on Jinja2/Django templates") (description