From patchwork Sun Jun 18 11:28:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 51054 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 35E5A27BBE9; Sun, 18 Jun 2023 12:31:49 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable 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 E075E27BBE2 for ; Sun, 18 Jun 2023 12:31:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAqbt-0006Cw-Gm; Sun, 18 Jun 2023 07:30:21 -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 1qAqbg-000635-PX for guix-patches@gnu.org; Sun, 18 Jun 2023 07:30:08 -0400 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 1qAqbf-0003qm-MU for guix-patches@gnu.org; Sun, 18 Jun 2023 07:30:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qAqbf-0003sM-Hl; Sun, 18 Jun 2023 07:30:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64150] [PATCH 11/24] gnu: ruby-tzinfo: Update to 2.0.6. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: mail@cbaines.net, guix-patches@gnu.org Resent-Date: Sun, 18 Jun 2023 11:30:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64150@debbugs.gnu.org Cc: Christopher Baines X-Debbugs-Original-Xcc: Christopher Baines Received: via spool by 64150-submit@debbugs.gnu.org id=B64150.168708774613987 (code B ref 64150); Sun, 18 Jun 2023 11:30:07 +0000 Received: (at 64150) by debbugs.gnu.org; 18 Jun 2023 11:29:06 +0000 Received: from localhost ([127.0.0.1]:53341 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAqaf-0003dS-Tn for submit@debbugs.gnu.org; Sun, 18 Jun 2023 07:29:06 -0400 Received: from mira.cbaines.net ([212.71.252.8]:42692) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAqaV-0003Zj-Ib for 64150@debbugs.gnu.org; Sun, 18 Jun 2023 07:28:57 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:3a91:a0a4:ecee:f157]) by mira.cbaines.net (Postfix) with ESMTPSA id 88B6927BBF3 for <64150@debbugs.gnu.org>; Sun, 18 Jun 2023 12:28:53 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 1d0a9bf7 for <64150@debbugs.gnu.org>; Sun, 18 Jun 2023 11:28:52 +0000 (UTC) From: Christopher Baines Date: Sun, 18 Jun 2023 12:28:38 +0100 Message-Id: <133ff7a8df1425cd2c976fd0e02558814d0085cd.1687087731.git.mail@cbaines.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <87leghko6e.fsf@cbaines.net> References: <87leghko6e.fsf@cbaines.net> 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: , 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/ruby.scm (ruby-tzinfo): Update to 2.0.6. [arguments,propagated-inputs]: Update style. --- gnu/packages/ruby.scm | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index f24c709280..1dce3dc315 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7011,7 +7011,7 @@ (define-public ruby-thread-safe (define-public ruby-tzinfo (package (name "ruby-tzinfo") - (version "2.0.4") + (version "2.0.6") (source (origin (method git-fetch) @@ -7022,31 +7022,29 @@ (define-public ruby-tzinfo (file-name (git-file-name name version)) (sha256 (base32 - "0jaq1givdaz5jxz47xngyj3j315n872rk97mnpm5njwm48wy45yh")))) + "1n1gzjqwwnx209h8d054miva0y7x17db2ahy7jav5r25ibhh7rgm")))) (build-system ruby-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'skip-safe-tests - (lambda _ - (substitute* "test/test_utils.rb" - (("def safe_test\\(options = \\{\\}\\)") + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'skip-safe-tests + (lambda _ + (substitute* "test/test_utils.rb" + (("def safe_test\\(options = \\{\\}\\)") "def safe_test(options = {}) - skip('The Guix build environment has an unsafe load path')")) - #t)) - (add-before 'check 'pre-check - (lambda _ - (setenv "HOME" (getcwd)) - (substitute* "Gemfile" - (("simplecov.*") "simplecov'\n")) - #t)) - (replace 'check - (lambda* (#:key tests? test-target #:allow-other-keys) - (when tests? - (invoke "bundler" "exec" "rake" test-target)) - #t))))) + skip('The Guix build environment has an unsafe load path')")))) + (add-before 'check 'pre-check + (lambda _ + (setenv "HOME" (getcwd)) + (substitute* "Gemfile" + (("simplecov.*") "simplecov'\n")))) + (replace 'check + (lambda* (#:key tests? test-target #:allow-other-keys) + (when tests? + (invoke "bundler" "exec" "rake" test-target))))))) (propagated-inputs - `(("ruby-concurrent-ruby" ,ruby-concurrent))) + (list ruby-concurrent)) (native-inputs (list ruby-simplecov)) (synopsis "Time zone library for Ruby")