From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 15 11:05:21 2022 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 To: 55997@debbugs.gnu.org Subject: [PATCH staging 2/4] gnu: Remove texlive's dependence on ruby-rspec and ruby-byebug. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 55997 Cc: Tom Fitzhenry X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 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")))) -- 2.36.1