From patchwork Thu Jun 15 17:08:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 50920 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 842F027BBE9; Thu, 15 Jun 2023 18:09:30 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS 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 34CE427BBE2 for ; Thu, 15 Jun 2023 18:09:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q9qT2-0003Qj-Ha; Thu, 15 Jun 2023 13:09:04 -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 1q9qT1-0003QN-1Y for guix-patches@gnu.org; Thu, 15 Jun 2023 13:09:03 -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 1q9qT0-0000i5-Od for guix-patches@gnu.org; Thu, 15 Jun 2023 13:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q9qT0-0002Lg-JM; Thu, 15 Jun 2023 13:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64083] [PATCH 1/2] gnu: ruby-mini-portile-2: Update to 2.8.2. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: mail@cbaines.net, guix-patches@gnu.org Resent-Date: Thu, 15 Jun 2023 17:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64083 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64083@debbugs.gnu.org Cc: gemmaro , Christopher Baines X-Debbugs-Original-Xcc: Christopher Baines Received: via spool by 64083-submit@debbugs.gnu.org id=B64083.16868489288994 (code B ref 64083); Thu, 15 Jun 2023 17:09:02 +0000 Received: (at 64083) by debbugs.gnu.org; 15 Jun 2023 17:08:48 +0000 Received: from localhost ([127.0.0.1]:47723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9qSm-0002L0-8s for submit@debbugs.gnu.org; Thu, 15 Jun 2023 13:08:48 -0400 Received: from mail-pl1-f173.google.com ([209.85.214.173]:58606) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9qSj-0002Kl-Tw for 64083@debbugs.gnu.org; Thu, 15 Jun 2023 13:08:46 -0400 Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1b3d44e3d1cso37708975ad.0 for <64083@debbugs.gnu.org>; Thu, 15 Jun 2023 10:08:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686848920; x=1689440920; 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=Lh8cq/2VhgXWN4Ad3MM3jovnFH1DlpOluvBwzZYZW5U=; b=FgfeAHZZcZyXpsMbrH0oYMyJVPMakafqL6cpRw/XSF0rSk+nucwWRvXNDGycaJKJuY T0k73LizgWZ+infahEIVjWpxsEKa4+Pq/1SydHRi87xlqsJKGaVo9Fs8iJFj3gMEkKFQ QWt2RQT2wEYcHeaZFcHwl+XdnewDgMWvXHrjeUMa7fxX3+BvnZwUgk14SQC6J1vQ/bMc wA8TUlnHsFJPC7mYQo3ycMNyeEe5gXpffFwnU+BEn4IxxanBxzAzNKbIgoPAMoo52hRx F5um2EQpghW7B7s5bjBrzl1KjmkkUEHezJ/gWficDnipJSl0My5e/1QVyaEgFw+aWH9O Wt9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686848920; x=1689440920; 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=Lh8cq/2VhgXWN4Ad3MM3jovnFH1DlpOluvBwzZYZW5U=; b=BvRSTiL8V4mYuDfx0lemIInM4atX/ZHqUy44SYJZTprzOFQ/Qblhyp0BZtYRNj3zoA ExV0VUoqf7bdIG7OhDmxiZG9aZF/BVsAqV6t+enTayNGuB49kNW7YMWMyh+sdxOjawPC OnripOQKDGhmGdcCdRRnJOtQRf4iSGZNUmxvxOOGCKZQn42SzL/hXDI/AHrPpfOVQ6N5 riHQZDy/8DDX/yEw+CLKV8MWPu+XMGrf7B8nHlrglWEFWNhLjEo9zG7SBWqWcW0WEVMx r1WZMGE99j6U3Yy20uR6HaWdWIrVPnlWzRZBOGufcw0CC8VcpW6h3NMSEnGRZHJ4u0Sy UsqA== X-Gm-Message-State: AC+VfDz3R+E8ZNlLUsFlWQwCdOEbDzRW9kMkAUqxdB0nCSkZ3HHss6RE BeZp1dtDSxO/wLdgC7KWHK9g1z5IjWziQA== X-Google-Smtp-Source: ACHHUZ7+ie4yMwnfErWtLj37oPJE3qET+FR5ZfJqYto6kgJQd0e4pmm/3oDHOw+f/kUXRaqXEi5OIA== X-Received: by 2002:a17:902:e811:b0:1ad:f407:37d2 with SMTP id u17-20020a170902e81100b001adf40737d2mr19409243plg.5.1686848919659; Thu, 15 Jun 2023 10:08:39 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id iz21-20020a170902ef9500b001b3be5d313dsm3365541plb.242.2023.06.15.10.08.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jun 2023 10:08:39 -0700 (PDT) From: gemmaro Date: Fri, 16 Jun 2023 02:08:27 +0900 Message-Id: <56c348f0b96c031c0deccba4cf7b062023dd7b4d.1686848553.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.40.1 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: , 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-mini-portile-2): Update to 2.8.2. --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index f28ad97e111..9587c29a0ab 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6243,13 +6243,13 @@ (define-public ruby-mini-portile (define-public ruby-mini-portile-2 (package (inherit ruby-mini-portile) - (version "2.8.1") + (version "2.8.2") (source (origin (method url-fetch) (uri (rubygems-uri "mini_portile2" version)) (sha256 (base32 - "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp")))))) + "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6")))))) (define-public ruby-nokogiri (package From patchwork Thu Jun 15 17:08:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 50919 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 D4B4D27BBE9; Thu, 15 Jun 2023 18:09:29 +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=-3.7 required=5.0 tests=BAYES_00,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 99D3627BBE2 for ; Thu, 15 Jun 2023 18:09:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q9qT3-0003RG-BV; Thu, 15 Jun 2023 13:09:05 -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 1q9qT1-0003QU-E3 for guix-patches@gnu.org; Thu, 15 Jun 2023 13:09:03 -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 1q9qT1-0000iG-4b for guix-patches@gnu.org; Thu, 15 Jun 2023 13:09:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q9qT0-0002Lo-Vu; Thu, 15 Jun 2023 13:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64083] [PATCH 2/2] gnu: ruby-nokogiri: Update to 1.15.2. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: mail@cbaines.net, guix-patches@gnu.org Resent-Date: Thu, 15 Jun 2023 17:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64083 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64083@debbugs.gnu.org Cc: gemmaro , Christopher Baines X-Debbugs-Original-Xcc: Christopher Baines Received: via spool by 64083-submit@debbugs.gnu.org id=B64083.16868489349013 (code B ref 64083); Thu, 15 Jun 2023 17:09:02 +0000 Received: (at 64083) by debbugs.gnu.org; 15 Jun 2023 17:08:54 +0000 Received: from localhost ([127.0.0.1]:47726 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9qSr-0002LI-JE for submit@debbugs.gnu.org; Thu, 15 Jun 2023 13:08:54 -0400 Received: from mail-pl1-f171.google.com ([209.85.214.171]:54594) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9qSq-0002Kx-58 for 64083@debbugs.gnu.org; Thu, 15 Jun 2023 13:08:52 -0400 Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1b51780c1b3so7617635ad.1 for <64083@debbugs.gnu.org>; Thu, 15 Jun 2023 10:08:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686848926; x=1689440926; 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=J5jC7U+jnM3aChn6P1u2X7DXgYISKa3KT0w/dpBJnt4=; b=g2nBdPM4KIu6KEP5WpaKOkrXBxS7XOjScUMt+Ac9BiGSUtYWxFuozX7izPCBduH52A X/f0ZqQJjOOQhOeXeB66HWjBwOEfxGXUbEn5vH1GKXqf1yPPjIZRLfXQ4cA2g1zngtqX BShjQ5hd0u3gy+3xDr6s64anMDihq/sj3u2h6jT3xlK8LINAuSt3151UsyEyJRfwnfx5 TwIOo4mZomYaKWz3o8cbxHll6DkaV/tJX3uMxIwO3NJl/5c4YdOEHFT/KOZL5AXp1m/L dQgO54wo30rue/bTwlSa5nx0q7o4LHdg56pgs7UM/4qC0V2x00O5DYj2beKTBlE6D1ZC xdSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686848926; x=1689440926; 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=J5jC7U+jnM3aChn6P1u2X7DXgYISKa3KT0w/dpBJnt4=; b=VsgsZQuMbhHhfsAz7Rqw8b7bdYNWdWu/EnEOqRqxRxg/wjXLhBi+1GXHs5HZx97gvE E4ALE5KmZHtwhloFO9MenmMi+TSeFCiq0R2zMkAN/jci1sg5M0Sg3mHIrbFjDDUKcBbg SGQlvW6Z7V8GbbwwS5KHH0AlQ5VP96j1ZBPbUf9uRvw5dx3JqJjW5fJIqN0Y55U89gyc KkuPuHT7wwO2sz/WTPzmCC9Eysucpt9qcK6+LOqzHXUjhbCRB2sbiOFEp2ZpOEsm7je1 nJ5jgQl0b3G0E7DatZjWkBtEbIFKsThGHJ5EMFY3wjeKO0VgGbX9EfI2yQNa1cMubyyy O2rQ== X-Gm-Message-State: AC+VfDx+DmJjZ48T1PsJJqe/DD7bmbxT5ze9GXuJnQdi+6Odx5GPPWv7 z9iEIF/7XqtaDz8qLw6gbinTpI6d9xPLMw== X-Google-Smtp-Source: ACHHUZ7+thlme1dwoQjAnGIgiTJ3FmH1V83iWxBlM8XAmDtAvHJfbyEAiFHklcIAlqkhiziD7PhoRw== X-Received: by 2002:a17:903:230f:b0:1a6:82ac:f277 with SMTP id d15-20020a170903230f00b001a682acf277mr17454688plh.14.1686848926100; Thu, 15 Jun 2023 10:08:46 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id iz21-20020a170902ef9500b001b3be5d313dsm3365541plb.242.2023.06.15.10.08.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jun 2023 10:08:45 -0700 (PDT) From: gemmaro Date: Fri, 16 Jun 2023 02:08:28 +0900 Message-Id: <50a3eff1756272bb051471e4f2be6888fd2c431c.1686848553.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.40.1 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: , 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-nokogiri): Update to 1.15.2. [source]: Use Git repository. : apply a patch to disable unneeded test setups. [arguments]: Enable check by running plain minitest. [home-page]: Update to current URL. --- gnu/packages/patches/ruby-nokogiri.patch | 29 +++++++++++++ gnu/packages/ruby.scm | 54 ++++++++++++++---------- 2 files changed, 61 insertions(+), 22 deletions(-) create mode 100644 gnu/packages/patches/ruby-nokogiri.patch diff --git a/gnu/packages/patches/ruby-nokogiri.patch b/gnu/packages/patches/ruby-nokogiri.patch new file mode 100644 index 00000000000..b55b4302344 --- /dev/null +++ b/gnu/packages/patches/ruby-nokogiri.patch @@ -0,0 +1,29 @@ +Description: Removed some unnecessary test setup such as SimpleCov and + minitest-reporters. +diff --git a/test/helper.rb b/test/helper.rb +index ed3133c6..4f5d4f1b 100644 +--- a/test/helper.rb ++++ b/test/helper.rb +@@ -13,22 +13,10 @@ + # - NOKOGIRI_GC: read more in test/test_memory_leak.rb + # + +-require "simplecov" +-SimpleCov.start do +- add_filter "/test/" +- enable_coverage :branch +-end +- + $VERBOSE = true + + require "minitest/autorun" + require "minitest/benchmark" +-require "minitest/reporters" +- +-nokogiri_minitest_reporters_options = { color: true, slow_count: 10, detailed_skip: false } +-nokogiri_minitest_reporters_options[:fast_fail] = true if ENV["NOKOGIRI_TEST_FAIL_FAST"] +-puts "Minitest::Reporters options: #{nokogiri_minitest_reporters_options}" +-Minitest::Reporters.use!(Minitest::Reporters::DefaultReporter.new(nokogiri_minitest_reporters_options)) + + require "fileutils" + require "tempfile" diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 9587c29a0ab..ae345bd5bfc 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6254,38 +6254,48 @@ (define-public ruby-mini-portile-2 (define-public ruby-nokogiri (package (name "ruby-nokogiri") - (version "1.13.10") + (version "1.15.2") (source (origin - (method url-fetch) - (uri (rubygems-uri "nokogiri" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/sparklemotion/nokogiri") + (commit "a6ad20b3edc8f020043ccfe5d9ec6ae9af103720"))) + (file-name (git-file-name name version)) (sha256 (base32 - "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk")))) + "1n0vlg6v58jw3qzgyihz1dh5fvp4js1qgdh75j0kn47nvyiw3jxj")) + (patches (search-patches "ruby-nokogiri.patch")))) (build-system ruby-build-system) (arguments - ;; Tests fail because Nokogiri can only test with an installed extension, - ;; and also because many test framework dependencies are missing. - (list - #:tests? #f - #:gem-flags #~(list "--" "--use-system-libraries" - (string-append "--with-xml2-include=" - #$(this-package-input "libxml2") - "/include/libxml2" )) - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'delete-mkmf.log - (lambda _ - ;; Rubygems installs build log files that embed volatile file - ;; names (see: - ;; https://github.com/rubygems/rubygems/issues/6259). - (for-each delete-file (find-files #$output "^mkmf\\.log$"))))))) - (native-inputs (list ruby-hoe)) + (list #:gem-flags #~(list "--" "--use-system-libraries" + (string-append "--with-xml2-include=" + #$(this-package-input "libxml2") + "/include/libxml2")) + #:phases #~(modify-phases %standard-phases + (add-after 'install 'delete-mkmf.log + (lambda _ + ;; Rubygems installs build log files that embed volatile file + ;; names (see: + ;; https://github.com/rubygems/rubygems/issues/6259). + (for-each delete-file + (find-files #$output "^mkmf\\.log$")))) + (delete 'check) + (add-after 'install 'check + (lambda* (#:key tests? #:allow-other-keys) + (setenv "GEM_PATH" (string-append + (getenv "GEM_PATH") ":" + #$output "/lib/ruby/vendor_ruby")) + (when tests? + (for-each (lambda (file) + (invoke "ruby" "-Itest" file)) + (find-files "test" "^test_.*\\.rb")))))))) + (native-inputs (list ruby-hoe ruby-rubyzip)) (inputs (list zlib libxml2 libxslt)) (propagated-inputs (list ruby-mini-portile-2 ruby-pkg-config)) (synopsis "HTML, XML, SAX, and Reader parser for Ruby") (description "Nokogiri (鋸) parses and searches XML/HTML, and features both CSS3 selector and XPath 1.0 support.") - (home-page "https://www.nokogiri.org/") + (home-page "https://nokogiri.org/") (license license:expat))) (define-public ruby-method-source