From patchwork Wed Jun 15 15:04:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Fitzhenry X-Patchwork-Id: 40029 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 E2FE427BBEA; Wed, 15 Jun 2022 16:37:39 +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_INVALID, DKIM_SIGNED,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 3891E27BBE9 for ; Wed, 15 Jun 2022 16:37:39 +0100 (BST) Received: from localhost ([::1]:38616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1V5O-0008Pd-9O for patchwork@mira.cbaines.net; Wed, 15 Jun 2022 11:37:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1Uap-00005y-77 for guix-patches@gnu.org; Wed, 15 Jun 2022 11:06:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45543) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o1Uao-0003tC-UF for guix-patches@gnu.org; Wed, 15 Jun 2022 11:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o1Uao-0000An-KX for guix-patches@gnu.org; Wed, 15 Jun 2022 11:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55997] [PATCH staging 1/4] gnu: Add ruby-hydra-minimal. Resent-From: Tom Fitzhenry Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Jun 2022 15:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55997 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55997@debbugs.gnu.org Cc: Tom Fitzhenry Received: via spool by 55997-submit@debbugs.gnu.org id=B55997.1655305517552 (code B ref 55997); Wed, 15 Jun 2022 15:06:02 +0000 Received: (at 55997) by debbugs.gnu.org; 15 Jun 2022 15:05:17 +0000 Received: from localhost ([127.0.0.1]:39423 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1Ua5-00008q-B5 for submit@debbugs.gnu.org; Wed, 15 Jun 2022 11:05:17 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:47321) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1Ua3-00008V-3m for 55997@debbugs.gnu.org; Wed, 15 Jun 2022 11:05:15 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 529CF3200AEA; Wed, 15 Jun 2022 11:05:09 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 15 Jun 2022 11:05:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= tom-fitzhenry.me.uk; h=cc:cc:content-transfer-encoding:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm2; t= 1655305508; x=1655391908; bh=VwD15TTDedD7txTJZZ+7BYLgjisxtzxXQG6 Z7ElbQ8k=; b=ZKaI/8pcBrPmjE6J7EpVd0htfsdkVt4Lu286uwYDR0ySFnbzqiD ZtXkkjFCZsN+URil0nzfoiYncBwYCIRYcoZAKLx5vLnChIsDhi7IeAT0ZtVDrGZm 6E2+E9vegtSlazbbYLnzX40Jz1sCC/bCku+zdOQuLou1w27PCZN4rT2GcZormvTu Mc+Gn9OloXnJGEXI8LdEp8Vj9iyAU9gLMr5tcdYRLaLZxE4VHhqcyFMF+ap+nbtn u+GVm/Avl0/eaHdyMZNGM+A1h5wE8pXapXKlfdxM/0uURd8ndnLyrURbQqJbU9gQ zYz9jwAKhsUsb6YjXAUcFl+VT5WSgKs0DGw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1655305508; x=1655391908; bh=VwD15TTDedD7t xTJZZ+7BYLgjisxtzxXQG6Z7ElbQ8k=; b=BZguUtABnmP/zLZFfvdID0Cn+6mRB c2m9iDnSMtIhTx9IInTlth7L7lPAJ3f/GuOhDDrjSDfPr1nUyRBw4/ndr2jaBlIq IimRQ6AbPYw78svF5pn5Zge4LgLV63oc6WMSHKwUPPXw6SlOsxLEOi5G3EuUuD6X 4L6pf7DhcLIiUzsrzj+xNQ/biRqmmXaa1y9g6TZjDcWBy860yZqij0E1hr6BMVNI yg85BAKAkjK8FLASgOgYanoDplLmwoYg1EUTpuClnK/hivV5pxqW7S90vlb/IE/+ EvejCf2ALdDCIBN7tAaPva/eenPHC/sZzB9CUn0BF5JrPIDOgl8q9yVRg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedruddvuddgkeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefvohhmucfhihhtiihhvghnrhihuceothhomhesthhomhdq fhhithiihhgvnhhrhidrmhgvrdhukheqnecuggftrfgrthhtvghrnhepueffuefgffdufe elgeehgfelgeefkefhgfegffeihfegfefhieeghfetkeeiffdvnecuffhomhgrihhnpehg ihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih hlfhhrohhmpehtohhmsehtohhmqdhfihhtiihhvghnrhihrdhmvgdruhhk X-ME-Proxy: Feedback-ID: iefc945ae:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 15 Jun 2022 11:05:06 -0400 (EDT) From: Tom Fitzhenry Date: Thu, 16 Jun 2022 01:04:31 +1000 Message-Id: <20220615150434.11604-1-tom@tom-fitzhenry.me.uk> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220615145805.3189-1-tom@tom-fitzhenry.me.uk> References: <20220615145805.3189-1-tom@tom-fitzhenry.me.uk> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/ruby-hydra-no-byebug.patch: New file. * gnu/packages/ruby.scm (ruby-hydra): Refactor to inherit from ruby-hydra-minimal. (ruby-hydra-minimal): New variable. --- .../patches/ruby-hydra-no-byebug.patch | 9 +++++ gnu/packages/ruby.scm | 35 +++++++++++++------ 2 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 gnu/packages/patches/ruby-hydra-no-byebug.patch diff --git a/gnu/packages/patches/ruby-hydra-no-byebug.patch b/gnu/packages/patches/ruby-hydra-no-byebug.patch new file mode 100644 index 0000000000..902d32a30a --- /dev/null +++ b/gnu/packages/patches/ruby-hydra-no-byebug.patch @@ -0,0 +1,9 @@ +diff --git a/lib/hydra.rb b/lib/hydra.rb +index 29fbad2..6b5058a 100644 +--- a/lib/hydra.rb ++++ b/lib/hydra.rb +@@ -1,4 +1,3 @@ +-require 'byebug' unless ENV['RACK_ENV'] == "production" + require 'pp' + + module CoreExt diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 54dcae9089..2622bf717a 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3124,24 +3124,39 @@ (define-public ruby-hashdiff (home-page "https://github.com/liufengyun/hashdiff") (license license:expat))) -(define-public ruby-hydra +(define-public ruby-hydra-minimal ;; No releases yet. (let ((commit "5abfa378743756ae4d9306cc134bcc482f5c9525") (revision "0")) (package - (name "ruby-hydra") + (name "ruby-hydra-minimal") (version (git-version "0.0" revision commit)) (home-page "https://github.com/hyphenation/hydra") (source (origin (method git-fetch) (uri (git-reference (url home-page) (commit commit))) (file-name (git-file-name name version)) + ;; byebug is a non-essential debugging utility that brings in + ;; many dependencies. + (patches (search-patches "ruby-hydra-no-byebug.patch")) (sha256 (base32 "1cik398l2765y3d9sdhjzki3303hkry58ac6jlkiy7iy62nm529f")))) (build-system ruby-build-system) (arguments - '(#:phases (modify-phases %standard-phases + ;; Avoid rspec dependency. + '(#:tests? #f)) + (synopsis "Ruby hyphenation patterns") + (description + "ruby-hydra-minimal is a Ruby library for working with hyphenation patterns. It is a low-dependency variant of ruby-hydra.") + (license license:expat)))) + +(define-public ruby-hydra + (package + (inherit ruby-hydra-minimal) + (name "ruby-hydra") + (arguments + '(#:phases (modify-phases %standard-phases (add-after 'unpack 'make-files-writable (lambda _ (for-each make-file-writable (find-files ".")) @@ -3149,14 +3164,12 @@ (define-public ruby-hydra (replace 'check (lambda _ (invoke "rspec")))))) - (native-inputs - (list ruby-rspec)) - (propagated-inputs - (list ruby-byebug)) - (synopsis "Ruby hyphenation patterns") - (description - "ruby-hydra is a Ruby library for working with hyphenation patterns.") - (license license:expat)))) + (native-inputs + (list ruby-rspec)) + (propagated-inputs + (list ruby-byebug)) + (description + "ruby-hydra is a Ruby library for working with hyphenation patterns."))) (define-public ruby-shindo (package From patchwork Wed Jun 15 15:04:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Fitzhenry X-Patchwork-Id: 40028 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 4D36E27BBEA; Wed, 15 Jun 2022 16:30: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_INVALID, DKIM_SIGNED,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 9570F27BBE9 for ; Wed, 15 Jun 2022 16:30:29 +0100 (BST) Received: from localhost ([::1]:55354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1UyS-0000SO-LD for patchwork@mira.cbaines.net; Wed, 15 Jun 2022 11:30:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1Uap-00006l-E4 for guix-patches@gnu.org; Wed, 15 Jun 2022 11:06:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45544) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o1Uap-0003tH-4k for guix-patches@gnu.org; Wed, 15 Jun 2022 11:06:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o1Uap-0000Au-0J for guix-patches@gnu.org; Wed, 15 Jun 2022 11:06:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55997] [PATCH staging 2/4] gnu: Remove texlive's dependence on ruby-rspec and ruby-byebug. Resent-From: Tom Fitzhenry Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Jun 2022 15:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55997 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55997@debbugs.gnu.org Cc: Tom Fitzhenry Received: via spool by 55997-submit@debbugs.gnu.org id=B55997.1655305521569 (code B ref 55997); Wed, 15 Jun 2022 15:06:02 +0000 Received: (at 55997) by debbugs.gnu.org; 15 Jun 2022 15:05:21 +0000 Received: from localhost ([127.0.0.1]:39428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1Ua8-000097-Ma for submit@debbugs.gnu.org; Wed, 15 Jun 2022 11:05:21 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:54457) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1Ua6-00008c-4B for 55997@debbugs.gnu.org; Wed, 15 Jun 2022 11:05:18 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 83FB93200B57; Wed, 15 Jun 2022 11:05:12 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 15 Jun 2022 11:05:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= tom-fitzhenry.me.uk; h=cc:cc:content-transfer-encoding:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm2; t= 1655305512; x=1655391912; bh=icyB7wyoISi/Y0MORIDFPCKlTXXV4v227sl nTefd1KQ=; b=DhCsuKEXGsyyR9iWKa/RswZARZN3D5TxAMZebRx6u7iTUyJ2FwX w8p1gQ3ZcmrFqnSH2UJol4vd7U5RTva4kZrIYHrXir/mlWSYO46HgjWnTwXENFSW aoyPVMUYHCZeHMEByC3I0hTjlxzr1339hChL0m+WZmwZphiypIacK/DNVq+pJidH K6HA6g2aWE0qHeNrHP/MSq0stPC/kDbtdmWwMwkv0xjfwn8JvIvZb/4hRHHNMYlo hPwBMHz+f1VCWsoUiZXlZbyCQjfXb4Ytmq/jSHe+G0OOZLmadjckaLsanM8VzPx/ 0HNh8WZduE0j9vJpPvYkgEQTNxsYHQZh8jQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1655305512; x=1655391912; bh=icyB7wyoISi/Y 0MORIDFPCKlTXXV4v227slnTefd1KQ=; b=qafB466+oHgM4QSWTdjwO9RU2KtFn D4AfUyIqe79+7S6VAhTUz4fW7XnCPYot9cm3nswiLRSY/KmkEQ58qOHIoZR4qClL agU7QKYVbmibgooCNu/czx2aiYP+VOQDeIRWu/DuxN4CHHkcC+9t2prewRhzUOjj WqujElghmXjGB7HNGoyxr9oqtcQKifojPa7GRkoCjAVTSGkVk7w3QA+myjc5jgZc L/9VcLzU9iNkkmQH3vitOTdAN1V2R3KmEhI4qzCQAcvHF6kv/SYxjT1y5laXaLtE u6WxayHBc333UEJbfBWjUsXOZNAVqDZtYywhMksM8P8Fdu1B1y+z8p1Lg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedruddvuddgkeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefvohhmucfhihhtiihhvghnrhihuceothhomhesthhomhdq fhhithiihhgvnhhrhidrmhgvrdhukheqnecuggftrfgrthhtvghrnhepgeetudfhgeekle ekgeekgeeghfdvfffgudfftedvhfduudevffdvheelueehgfdunecuffhomhgrihhnpegt thgrnhdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfh hrohhmpehtohhmsehtohhmqdhfihhtiihhvghnrhihrdhmvgdruhhk X-ME-Proxy: Feedback-ID: iefc945ae:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 15 Jun 2022 11:05:09 -0400 (EDT) From: Tom Fitzhenry Date: Thu, 16 Jun 2022 01:04:32 +1000 Message-Id: <20220615150434.11604-2-tom@tom-fitzhenry.me.uk> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220615150434.11604-1-tom@tom-fitzhenry.me.uk> References: <20220615145805.3189-1-tom@tom-fitzhenry.me.uk> <20220615150434.11604-1-tom@tom-fitzhenry.me.uk> 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" X-getmail-retrieved-from-mailbox: Patches Motivation: Break the dependency chain from guix to mariadb. Prior to this patch: $ guix graph --path guix mariadb guix@1.3.0-27.598f728 po4a@0.63 texlive-tiny@59745 texlive-latex-base@59745 texlive-hyphen-afrikaans@59745 ruby-hydra@0.0-0.5abfa37 ruby-byebug@11.1.3 ruby-rubocop@1.10.0 ruby-parallel@1.21.0 ruby-mysql2@0.5.2 mariadb@10.5.12 As of this patch: $ ./pre-inst-env guix graph --path guix mariadb guix graph: error: no path from 'guix@1.3.0-27.598f728' to 'mariadb@10.5.12' * gnu/packages/patches/texlive-hyph-utf8-no-byebug.patch: New file. * gnu/packages/tex.scm (hyph-utf8-scripts): Add patch. (texlive-hyphen-package): Depend on ruby-hydra-minimal. --- .../patches/texlive-hyph-utf8-no-byebug.patch | 11 +++++++++++ gnu/packages/tex.scm | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/texlive-hyph-utf8-no-byebug.patch diff --git a/gnu/packages/patches/texlive-hyph-utf8-no-byebug.patch b/gnu/packages/patches/texlive-hyph-utf8-no-byebug.patch new file mode 100644 index 0000000000..92d12d6665 --- /dev/null +++ b/gnu/packages/patches/texlive-hyph-utf8-no-byebug.patch @@ -0,0 +1,11 @@ +diff --git a/lib/tex/hyphen/language.rb b/lib/tex/hyphen/language.rb +index 12831417..df6daa39 100644 +--- a/lib/tex/hyphen/language.rb ++++ b/lib/tex/hyphen/language.rb +@@ -1,6 +1,5 @@ + require 'yaml' + require 'hydra' +-require 'byebug' + + require_relative 'path' + diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 1dd3f09f90..33e2fab23c 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -157,6 +157,7 @@ (define hyph-utf8-scripts (file-name (string-append "hyph-utf8-scripts-" (number->string %texlive-revision) "-checkout")) + (patches (search-patches "texlive-hyph-utf8-no-byebug.patch")) (sha256 (base32 "04xzf5gr3ylyh3ls09imrx4mwq3qp1k97r9njzlan6hlff875rx2")))) @@ -225,7 +226,7 @@ (define (texlive-hyphen-package name code locations hash) (invoke "ruby" "generate-ptex-patterns.rb"))))))))) (native-inputs `(("ruby" ,ruby) - ("ruby-hydra" ,ruby-hydra) + ("ruby-hydra-minimal" ,ruby-hydra-minimal) ("hyph-utf8-scripts" ,hyph-utf8-scripts))) (home-page "https://ctan.org/pkg/hyph-utf8")))) From patchwork Wed Jun 15 15:04:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Fitzhenry X-Patchwork-Id: 40030 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 C33C427BBEA; Wed, 15 Jun 2022 16:37:58 +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_INVALID, DKIM_SIGNED,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 8583B27BBE9 for ; Wed, 15 Jun 2022 16:37:58 +0100 (BST) Received: from localhost ([::1]:39620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1V5h-0000jJ-99 for patchwork@mira.cbaines.net; Wed, 15 Jun 2022 11:37:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1Uap-00008K-Pp for guix-patches@gnu.org; Wed, 15 Jun 2022 11:06:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45545) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o1Uap-0003tP-GL for guix-patches@gnu.org; Wed, 15 Jun 2022 11:06:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o1Uap-0000B1-C5 for guix-patches@gnu.org; Wed, 15 Jun 2022 11:06:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55997] [PATCH staging 3/4] gnu: unpin ruby-nokogiri-diff's ruby-nokogiri Resent-From: Tom Fitzhenry Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Jun 2022 15:06:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55997 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55997@debbugs.gnu.org Cc: Tom Fitzhenry Received: via spool by 55997-submit@debbugs.gnu.org id=B55997.1655305523583 (code B ref 55997); Wed, 15 Jun 2022 15:06:03 +0000 Received: (at 55997) by debbugs.gnu.org; 15 Jun 2022 15:05:23 +0000 Received: from localhost ([127.0.0.1]:39433 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1UaB-00009L-2T for submit@debbugs.gnu.org; Wed, 15 Jun 2022 11:05:23 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:34607) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1Ua9-00008o-76 for 55997@debbugs.gnu.org; Wed, 15 Jun 2022 11:05:21 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 4E90A3200B55; Wed, 15 Jun 2022 11:05:15 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 15 Jun 2022 11:05:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= tom-fitzhenry.me.uk; h=cc:cc:content-transfer-encoding:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm2; t= 1655305514; x=1655391914; bh=o65HXVrtoZQ2f6BuqcDzPKAQY/wXGYwl5v/ 1RFaBTFU=; b=H4qDsJjuNm6MelnPzJYtQZXD2GxijX0yTssy7W2AQ76+okbalHy Uc+giA0fbBHPYNeT9wGuvxhvtSa6WxSarMBhd2Saq7y7ELvqCZhhYhEPwrRNUStF SqdMaIC2QRYc/CB5VFHpbdYKfSOh21RtPyJI7KykMf8QcVK/ZYzNacxctTgzDU7p 3hYI0yIn5yHxngkdAJZbPcbOZ7XO1EeIC9Cu0EtIlMRo1gtr4RHRXf/q27EoQBIX BQ3DOdn641egcRBkewWo8seK/bLbiXZm9VqDdMYPcrVACogbSECjf1EYlfby4JdS uWXHNjqF72fH9beMcAZ0MXWGGclw86NeuzA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1655305514; x=1655391914; bh=o65HXVrtoZQ2f 6BuqcDzPKAQY/wXGYwl5v/1RFaBTFU=; b=YB61hzgZRCNvTeP7PqSLsDeTvBrSE RSR3qeHLssgB9lXtQRJFai+t1Wz8Ca2PxpnKpwg6i/oKNN8fF228pZsWeGnKdlAv HY0hRdJ7fMUDSKqblQU8F/XmMIiommRdEMyq3bKioy4x+EVwR3YeGYXQEWw90+m/ 7+6OF3ajXDxCRdP1zwoPBov3n31grU5zVQ++6jXRoXFAZ1Y5tJ5Rn+jym9S4YxFS 91tnjpRVXqaFJn7YlWLMCejRBD7n0DIFShabsFoqrj+NcaglRwcCWv1FJT2UcynQ DzGBwlg6ftACx0G+Fgc6fGwL8peUaytTeG5jh0LAX9tIkX0SIxWSTpFrw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedruddvuddgkeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefvohhmucfhihhtiihhvghnrhihuceothhomhesthhomhdq fhhithiihhgvnhhrhidrmhgvrdhukheqnecuggftrfgrthhtvghrnhepfeegjeetveegie elhfegtdettedvvdegkedugfdtueejvefffeeutdejjeelhfefnecuvehluhhsthgvrhfu ihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepthhomhesthhomhdqfhhithiihh gvnhhrhidrmhgvrdhukh X-ME-Proxy: Feedback-ID: iefc945ae:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 15 Jun 2022 11:05:13 -0400 (EDT) From: Tom Fitzhenry Date: Thu, 16 Jun 2022 01:04:33 +1000 Message-Id: <20220615150434.11604-3-tom@tom-fitzhenry.me.uk> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220615150434.11604-1-tom@tom-fitzhenry.me.uk> References: <20220615145805.3189-1-tom@tom-fitzhenry.me.uk> <20220615150434.11604-1-tom@tom-fitzhenry.me.uk> 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" X-getmail-retrieved-from-mailbox: Patches ruby-nokogiri-diff historically had a long reverse dependency set, due to its reverse dependency of texlive, which was solely via ruby-byebugs. To avoid ruby-nokogiri updates from triggering rebuilds, ruby-nokogiri-diff was pinned to ruby-nokogiri-1.10. However, as of commit "gnu: Remove texlive's dependence on ruby-rspec and ruby-byebug.", texlive no longer depends on ruby-byebug, and thus updating ruby-nokogiri won't trigger large rebuilds. Thus, we are now free to unpin ruby-nokogiri-diff's ruby-nokogiri. * gnu/packages/ruby.scm (ruby-nokogiri-diff): Unpin ruby-nokogiri version. --- gnu/packages/ruby.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 2622bf717a..ffa04b52cf 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6708,8 +6708,7 @@ (define-public ruby-nokogiri-diff (build-system ruby-build-system) (propagated-inputs (list ruby-tdiff - ;; Use a fixed version to prevent rebuilds; see ruby-nokogiri TODO. - ruby-nokogiri-1.10)) + ruby-nokogiri)) (native-inputs (list ruby-rspec ruby-yard ruby-rubygems-tasks)) (synopsis "Calculate the differences between two XML/HTML documents") From patchwork Wed Jun 15 15:04:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tom Fitzhenry X-Patchwork-Id: 40031 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 C7D5827BBEA; Wed, 15 Jun 2022 16:41:50 +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_INVALID, DKIM_SIGNED,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 3B2AF27BBE9 for ; Wed, 15 Jun 2022 16:41:50 +0100 (BST) Received: from localhost ([::1]:45306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1V9R-00056V-2Z for patchwork@mira.cbaines.net; Wed, 15 Jun 2022 11:41:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1Uaq-00009n-6X for guix-patches@gnu.org; Wed, 15 Jun 2022 11:06:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45546) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o1Uap-0003tU-T1 for guix-patches@gnu.org; Wed, 15 Jun 2022 11:06:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o1Uap-0000B9-O1 for guix-patches@gnu.org; Wed, 15 Jun 2022 11:06:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55997] [PATCH staging 4/4] gnu: Remove unused ruby-nokogiri-1.10. Resent-From: Tom Fitzhenry Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Jun 2022 15:06:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 55997 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55997@debbugs.gnu.org Cc: Tom Fitzhenry Received: via spool by 55997-submit@debbugs.gnu.org id=B55997.1655305526598 (code B ref 55997); Wed, 15 Jun 2022 15:06:03 +0000 Received: (at 55997) by debbugs.gnu.org; 15 Jun 2022 15:05:26 +0000 Received: from localhost ([127.0.0.1]:39438 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1UaE-00009a-B4 for submit@debbugs.gnu.org; Wed, 15 Jun 2022 11:05:26 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:48283) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1UaC-000094-B1 for 55997@debbugs.gnu.org; Wed, 15 Jun 2022 11:05:24 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id B74443200B57; Wed, 15 Jun 2022 11:05:18 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 15 Jun 2022 11:05:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= tom-fitzhenry.me.uk; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm2; t=1655305518; x=1655391918; bh=lFz1cZB+YQ N77btwKti9pS3VfPj/41+X6fYYwtfrrdI=; b=fEGdr7mRY1+0K6AEfmKPXY+yRz gTuY5eVn3A6Ji4vfRjmbbpg4DqUHF9OBrFvlcrmGrRA/9mES+TBsYEDbld/HRG5j zDkyGrsN87tetgoM8eZf2byTIBPN1alx09+nL5BkvpdxXiZvi1ezaoldGBptNrxQ blIKqWxxXpsZVuk+2GFAQG5VLFir4HJVxnai13yzw3iTFIUA5rPJerK1h9+O98X3 raGsXdt3qoqQzQuNUfnpVfHMSynSL+G3cRrgVdLR9roQvjnh/jrjZs7MGxkVB9Ke PrXOLSFPJ8x5SLprelFdlgKkISPL8ZeL6W+rIwS7NxJLwmb3kc7Pa7EW2d/A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1655305518; x= 1655391918; bh=lFz1cZB+YQN77btwKti9pS3VfPj/41+X6fYYwtfrrdI=; b=g xFnaD5AtVef5R6e64ZYzv4voCVcEOwISfZCE7NI0xXcYlOG6ut42oXc/7e3JWz5q GFfmqyw0HsZQC7/2fnW26rXu3tlnNji+l5U3poEOZyddtuvvqecsMBq8cb2yZ9p5 erQElNyOdd6xfLBwFd4LOhaexSjqODBxqBqNsja/tT79JBs3znCfAwzCAHNm3WND n00RRBzwJNGs/LDVlVJyox6RWc0FDBs12wKtC8g9R/i+1nFdMc33u1VXP9JX5PPL B78AI8kdy6xrKw0Q0YQ6KcC1R7gxZqT5+em/Dj6qO1R3blbuUE/SfWvix++c13ZA G0AI55eoHLaixSInPxdsA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedruddvuddgkeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomhepvfhomhcuhfhithiihhgvnhhrhicuoehtohhmsehtohhm qdhfihhtiihhvghnrhihrdhmvgdruhhkqeenucggtffrrghtthgvrhhnpeeugeeiieekue eijeelvdduhedukeffteduhfelvdegjedvjeeileetheetffdtfeenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehtohhmsehtohhmqdhfihhtii hhvghnrhihrdhmvgdruhhk X-ME-Proxy: Feedback-ID: iefc945ae:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 15 Jun 2022 11:05:16 -0400 (EDT) From: Tom Fitzhenry Date: Thu, 16 Jun 2022 01:04:34 +1000 Message-Id: <20220615150434.11604-4-tom@tom-fitzhenry.me.uk> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220615150434.11604-1-tom@tom-fitzhenry.me.uk> References: <20220615145805.3189-1-tom@tom-fitzhenry.me.uk> <20220615150434.11604-1-tom@tom-fitzhenry.me.uk> 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" X-getmail-retrieved-from-mailbox: Patches As of commit "gnu: unpin ruby-nokogiri-diff's ruby-nokogiri", ruby-nokogiri-1.10 is unused, so let's remove it. ruby-nokogiri-1.10's purpose was to cut the dependency graph. Users should use ruby-nokogiri. * gnu/packages/ruby.scm (ruby-nokogiri-1.10): Remove variable. (ruby-nokogiri): Collapse the package inheritance. --- gnu/packages/ruby.scm | 48 +++++-------------------------------------- 1 file changed, 5 insertions(+), 43 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index ffa04b52cf..b3d8181587 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5030,19 +5030,16 @@ (define-public ruby-mini-portile-2 (base32 "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy")))))) -;; TODO: In the next rebuild cycle, provide texlive a version of ruby-hydra -;; that does not depend on byebug and rspec, so that their dependencies can -;; be updated more freely. For now pin this version to avoid rebuilds. -(define-public ruby-nokogiri-1.10 +(define-public ruby-nokogiri (package (name "ruby-nokogiri") - (version "1.10.9") + (version "1.12.5") (source (origin (method url-fetch) (uri (rubygems-uri "nokogiri" version)) (sha256 (base32 - "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm")))) + "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b")))) (build-system ruby-build-system) (arguments ;; Tests fail because Nokogiri can only test with an installed extension, @@ -5051,28 +5048,13 @@ (define-public ruby-nokogiri-1.10 #:gem-flags (list "--" "--use-system-libraries" (string-append "--with-xml2-include=" (assoc-ref %build-inputs "libxml2") - "/include/libxml2" )) - #:phases - (modify-phases %standard-phases - (add-before 'build 'patch-extconf - ;; 'pkg-config' is not included in the GEM_PATH during - ;; installation, so we add it directly to the load path. - (lambda* (#:key inputs #:allow-other-keys) - (let* ((pkg-config (assoc-ref inputs "ruby-pkg-config"))) - (substitute* "ext/nokogiri/extconf.rb" - (("gem 'pkg-config'.*") - (string-append "$:.unshift '" - pkg-config "/lib/ruby/vendor_ruby" - "/gems/pkg-config-" - ,(package-version ruby-pkg-config) - "/lib'\n")))) - #t))))) + "/include/libxml2" )))) (native-inputs (list ruby-hoe)) (inputs (list zlib libxml2 libxslt)) (propagated-inputs - (list ruby-mini-portile-2 ruby-pkg-config)) + (list ruby-mini-portile-2.6.1 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.") @@ -5091,26 +5073,6 @@ (define-public ruby-mini-portile-2.6.1 (base32 "1lvxm91hi0pabnkkg47wh1siv56s6slm2mdq1idfm86dyfidfprq")))))) -(define-public ruby-nokogiri - (package - (inherit ruby-nokogiri-1.10) - (version "1.12.5") - (source (origin - (method url-fetch) - (uri (rubygems-uri "nokogiri" version)) - (sha256 - (base32 - "1v02g7k7cxiwdcahvlxrmizn3avj2q6nsjccgilq1idc89cr081b")))) - (arguments - '(#:tests? #f ;XXX: no tests in rubygem - #:gem-flags (list "--" "--use-system-libraries" - (string-append "--with-xml2-include=" - (assoc-ref %build-inputs "libxml2") - "/include/libxml2")))) - (propagated-inputs - (modify-inputs (package-propagated-inputs ruby-nokogiri-1.10) - (replace "ruby-mini-portile" ruby-mini-portile-2.6.1))))) - (define-public ruby-method-source (package (name "ruby-method-source")