From patchwork Mon Mar 20 17:22:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 48310 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 C695516F1F; Mon, 20 Mar 2023 17:29:23 +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=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 C5D2816F2D for ; Mon, 20 Mar 2023 17:29:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peJHN-0004mj-HS; Mon, 20 Mar 2023 13:26:41 -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 1peJH4-0004VB-Hk for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:24 -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 1peJH0-0005SV-GG for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:21 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peJH0-00041r-Cf for guix-patches@gnu.org; Mon, 20 Mar 2023 13:26:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62196] [PATCH 136/223] gnu: ruby-rubyzip: Update to 2.3.2. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 17:26:18 +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.167933313114772 (code B ref 62196); Mon, 20 Mar 2023 17:26:18 +0000 Received: (at 62196) by debbugs.gnu.org; 20 Mar 2023 17:25:31 +0000 Received: from localhost ([127.0.0.1]:56121 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJGF-0003q1-13 for submit@debbugs.gnu.org; Mon, 20 Mar 2023 13:25:31 -0400 Received: from mail-qt1-f175.google.com ([209.85.160.175]:35608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peJFF-0003bK-6K for 62196@debbugs.gnu.org; Mon, 20 Mar 2023 13:24:29 -0400 Received: by mail-qt1-f175.google.com with SMTP id ay22so2629714qtb.2 for <62196@debbugs.gnu.org>; Mon, 20 Mar 2023 10:24:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679333068; 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=HHmuGVv5kdJkJ4hAlH9kRSYPwEkO0qd7Y/AjD61dpUs=; b=dpaxoWpUIbo4G+tTocplyyKhKdnwrBPKL0jdthRm6Mwb6Gkzok13Kj72uBjD+nipEQ IyWphkCNhF2yosQJja9zv4E2ab8uEPDXcV4Q0LnVazSP9nU51AuUEDihL4JwK0OL0aTh LpwgJ6DDPJ0azni5HzFJtYJD6l3XrFxE36RbNcBIna5XZcC2RuqFzZEVH9FSbIoPdACZ 0hVDchdtl2mxfSMizGgBGIEgVgyAAMn/ysNU3FdUWrDBzclEV+vt3jtsSdvJeZQFiyiT 36wrKZtmmCj2eR43J/y8gdVpxqas6Rr4P4ReM/bKifAcBHKWV0c7XlBftLW7H9DJPHsA KaOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679333068; 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=HHmuGVv5kdJkJ4hAlH9kRSYPwEkO0qd7Y/AjD61dpUs=; b=A5w1jxmiy3PC3wQg2P1T2ZR1RD5jo/lSFUw7ATNpByUhdyNodRkVZt6ilp8HvLDOr6 6hGdG6x7Eo0MGMj36HrzKry0uhSDroznXbHohFlHk58DRco/YAgXZ2mPE13mcvzsTB1V 4Ps0Scu2z3vuJ01391UkW+YOY26iUjnDAwWZsBbA7n+flMKO12yP2KIz0wdWmHKSw9ks 3NezXvm8z7YSJLJWDuJIbYzh7UgsPh/iMHAP3z7DbE/7ozCsJKpKw3izyiyhiq1YcaGL XTpei9Cw3R+wsn6p7TNOBdLF4Uz/WuSG5dwDpQaWSUkpBdfvHnMTnSlP/I8dlmcO2mGT m2pA== X-Gm-Message-State: AO0yUKUPXp1KlVadwfqBLKFX23BCUpQCSgIu+wzJQIJ1b1HIlz11my4U ZuModM/fHiuHE6s3BhZX4s4cmjHxkmc= X-Google-Smtp-Source: AK7set+aP3hzp/f4Z6dBzByucPV47GJwJLZfawe6dOJu962XKQtumwp1Q5iJRQcC4ZcPZbGlBecvCw== X-Received: by 2002:ac8:5e0c:0:b0:3c0:6cf:3226 with SMTP id h12-20020ac85e0c000000b003c006cf3226mr29781794qtx.8.1679333068672; Mon, 20 Mar 2023 10:24:28 -0700 (PDT) Received: from localhost.localdomain (dsl-10-128-46.b2b2c.ca. [72.10.128.46]) by smtp.gmail.com with ESMTPSA id i7-20020a378607000000b007422eee8058sm7769352qkd.125.2023.03.20.10.24.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 10:24:28 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 20 Mar 2023 13:22:22 -0400 Message-Id: <20230320172349.12752-35-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230320172349.12752-1-maxim.cournoyer@gmail.com> References: <20230320172349.12752-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-rubyzip): Update to 2.3.2. [arguments]: Streamline patch-tests phase. Add disable-rubocop and disable-problematic-tests phases. --- gnu/packages/ruby.scm | 82 ++++++++++++++++++++++++++++--------------- 1 file changed, 53 insertions(+), 29 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 965980a783..0e1fc0d3d5 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3515,35 +3515,59 @@ (define-public ruby-rubygems-tasks (define-public ruby-rubyzip (package - (name "ruby-rubyzip") - (version "1.2.1") - (source - (origin - (method url-fetch) - (uri (rubygems-uri "rubyzip" version)) - (sha256 - (base32 - "06js4gznzgh8ac2ldvmjcmg9v1vg9llm357yckkpylaj6z456zqz")))) - (build-system ruby-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-before 'check 'patch-tests - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "test/gentestfiles.rb" - (("/usr/bin/zip") - (string-append - (assoc-ref inputs "zip") "/bin/zip"))) - (substitute* "test/input_stream_test.rb" - (("/usr/bin/env ruby") (which "ruby"))) - #t))))) - (native-inputs - (list bundler ruby-simplecov zip unzip)) - (synopsis "Ruby module is for reading and writing zip files") - (description - "The rubyzip module provides ways to read from and create zip files.") - (home-page "https://github.com/rubyzip/rubyzip") - (license license:bsd-2))) + (name "ruby-rubyzip") + (version "2.3.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/rubyzip/rubyzip") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "03p8c990n6c1r4g64w0vv7z2iaswisl07l2f1lbh1s78cvmlmfxx")))) + (build-system ruby-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-rubocop + (lambda _ + (substitute* "Rakefile" + (("require 'rubocop/rake_task'") "") + (("RuboCop::RakeTask.new") "")))) + (add-before 'check 'patch-tests + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "test/gentestfiles.rb" + (("/usr/bin/zip") (which "zip"))) + (substitute* "test/input_stream_test.rb" + (("/usr/bin/env ruby") (which "ruby"))))) + (add-before 'check 'disable-problematic-tests + (lambda _ + (let-syntax ((skip-tests + (syntax-rules () + ((_ file test ...) + (substitute* file + (((string-append "def " test ".*") all) + (string-append + all " skip('fails on guix')\n")) ...))))) + ;; The test failures were reported here: + ;; https://github.com/rubyzip/rubyzip/issues/552. + (skip-tests "test/stored_support_test.rb" + "test_read") + (skip-tests "test/stored_support_test.rb" + "test_encrypted_read") + (skip-tests "test/output_stream_test.rb" + "test_put_next_entry_using_zip_entry_creates_\ +entries_with_correct_timestamps") + (skip-tests "test/file_options_test.rb" + "test_restore_times_true"))))))) + (native-inputs + (list bundler ruby-simplecov zip unzip)) + (synopsis "Ruby module is for reading and writing zip files") + (description + "The rubyzip module provides ways to read from and create zip files.") + (home-page "https://github.com/rubyzip/rubyzip") + (license license:bsd-2))) (define-public ruby-simplecov-html (package