From patchwork Mon Mar 20 17:29:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 48357 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 326A316F5A; Mon, 20 Mar 2023 17:31:18 +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=-1.8 required=5.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,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 506CA16F2D for ; Mon, 20 Mar 2023 17:31:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJL9-0001C6-6c; Mon, 20 Mar 2023 13:30: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 1peJKg-0000uO-1d for guix-patches@gnu.org; Mon, 20 Mar 2023 13: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 1peJKf-0007JY-0O for guix-patches@gnu.org; Mon, 20 Mar 2023 13:30:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJKe-0004jo-SF for guix-patches@gnu.org; Mon, 20 Mar 2023 13:30:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 204/223] gnu: ruby-hashie: Update to 5.0.0 and enable tests. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:30:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62196 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62196@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 62196-submit@debbugs.gnu.org id=B62196.167933339318060 (code B ref 62196); Mon, 20 Mar 2023 17:30:04 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:29:53 +0000 Received: from localhost ([127.0.0.1]:56348 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJKS-0004h9-CQ for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:29:52 -0400 Received: from mail-qt1-f178.google.com ([209.85.160.178]:33500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJKP-0004g5-B4 for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:29:49 -0400 Received: by mail-qt1-f178.google.com with SMTP id n2so14052278qtp.0 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:29:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679333383; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Z9Tv85w6qpiRk5HOhM6AnOXhUFAQzM5BNwxHlMFEwD8=; b=SfNOGSITC5vUD/awcde+eWqGnrRzWxIfpNrctGR/EpEDsE/QvNSSNhjd58BeMLEvrr XMIWWoQ4HS1rfVYDDPOfzhfrG1oTOnwosTYLKnV+aZz7DqklrqnwwmRNNdi/YXLJyXqi sbZRnyMSBtcOqQ68Dj8zvsySPPLT1jxxwBy+EbvKKgb1AIhSSu1pSlwj5LH0VLUBc9cP 1fGE0sZYIHpqeyI8STav5FW4nbrHkQY4T+dmvblgGX8IEAI9GhBd/+358NxfSSBr+M1o HWRUxPS6M1q59+MuogP0qOo3IxoktQt/mnXV1YZzKopddAqgg63e5ahz8LIK7EN1jdh8 4Dxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679333383; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z9Tv85w6qpiRk5HOhM6AnOXhUFAQzM5BNwxHlMFEwD8=; b=heMDfXEqF+0+5d7ItIG6HPua3MN5T6iKL4QQP/e1tgS1kX87S6ht0RiDjwqImk27/y D1pVHbFw/lOjQV0q7lBwBIzQhJiahrLsxpN9lEIhEePT9UDlq3br6CAc+NgGn7IPUPy1 ywYCCLZwdskJK2itm7W1dUbAttMd+7u9NIS2yISoabKk5UovQLhK/g9puugve37D4sGR aYWOZN6OtyeyQ8YoWQ0sD1kjaoFpiqdOI4nULGgz8dooQv7OMxv0ZNCuYPRoL2Zm1QMt mNOBMPS4ATqRkk1UyTu/krimjb/YchOVtzwxgi8EVb6/KKHv28oRISCGN9OuXRUAAStp ilRg== X-Gm-Message-State: AO0yUKWo4qPLDgNKYbISQqUDKY5ZtIaPMeNtXLik3bYbEPqL5UOD1RwL DxoPHOGl8JXYr4cJA5VPe9GilYiqG5g= X-Google-Smtp-Source: AK7set9M4Gk0Uu7GiRNkR1T5AK4zSD5QUzza8J4EQuD9mx1pCpvHv4TP+PheBNPT7fp07xEm5H+hvQ== X-Received: by 2002:a05:622a:11d0:b0:3bd:89d:224d with SMTP id n16-20020a05622a11d000b003bd089d224dmr22413qtk.3.1679333383653; Mon, 20 Mar 2023 10:29:43 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-46.b2b2c.ca. [72.10.128.46]) by smtp.gmail.com with ESMTPSA id g2-20020a37b602000000b0071aacb2c76asm7536708qkf.132.2023.03.20.10.29.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:29:43 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:29:14 -0400 Message-Id: <20230320172933.13101-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230320172933.13101-1-maxim.cournoyer@gmail.com> References: <20230320172933.13101-1-maxim.cournoyer@gmail.com> 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-hashie): Update to 5.0.0. [arguments]: Enable tests. Add #:test-target and #:phases arguments. [native-inputs]: New field. --- gnu/packages/ruby.scm | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 92fc99575d..520dd70a08 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -13054,18 +13054,37 @@ (define-public ruby-rouge (define-public ruby-hashie (package (name "ruby-hashie") - (version "3.6.0") + (version "5.0.0") (source (origin - (method url-fetch) - (uri (rubygems-uri "hashie" version)) + (method git-fetch) ;for tests + (uri (git-reference + (url "https://github.com/hashie/hashie") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "13bdzfp25c8k51ayzxqkbzag3wj5gc1jd8h7d985nsq6pn57g5xh")))) + "0ihami0cdn71cvwzwgr3vxqvqi0ifqsna0vlyqiqlhsnf93w0cm8")))) (build-system ruby-build-system) - (native-inputs - (list bundler)) - (arguments `(#:tests? #f)); FIXME: Could not locate Gemfile or .bundle/ directory - (home-page "https://github.com/intridea/hashie") + (arguments + (list #:test-target "spec" + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'disable-bundler + (lambda _ + (substitute* "Rakefile" + ((".*require 'bundler'.*") "") + ((".*Bundler.setup.*") "") + (("Bundler::GemHelper\\.install_tasks") "")))) + (add-after 'unpack 'disable-rubocop + (lambda _ + (substitute* "Rakefile" + (("require 'rubocop/rake_task'") "") + (("RuboCop::RakeTask.new") "")))) + (add-after 'unpack 'relax-requirements + (lambda _ + ;; Contains multiple extraneous dependencies. + (delete-file "Gemfile")))))) + (native-inputs (list ruby-json ruby-pry ruby-rspec ruby-rspec-pending-for)) + (home-page "https://github.com/hashie/hashie") (synopsis "Extensions to Ruby Hashes") (description "Hashie is a collection of classes and mixins that make Ruby hashes more powerful.")