From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id aGI6LRD7qWJlWwAAbAwnHQ (envelope-from ) for ; Wed, 15 Jun 2022 17:30:24 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 6DwhLRD7qWLiCwEAauVa8A (envelope-from ) for ; Wed, 15 Jun 2022 17:30:24 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 47B2010285 for ; Wed, 15 Jun 2022 17:30:24 +0200 (CEST) Received: from localhost ([::1]:55354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1UyL-0000SO-Bf for larch@yhetil.org; Wed, 15 Jun 2022 11:30:21 -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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1655307024; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=icyB7wyoISi/Y0MORIDFPCKlTXXV4v227slnTefd1KQ=; b=SeG5NZk+Mb01NQsMhW4mE7hipKdHMHDuP1S2Xrvh+qMvEyO834wGmAQ8a50y62ur1+VMg3 M4G9iTyBqDxCAImV5BhlXx0990XMqFOu3zQykip+50j6/fen40W4q3D6EMizLEzyItvKto lWZY9t2mgJ7XkdkRn4FsQiHPjVBB4R3Q+XKAfVGZpZ+aVb5uY41DXSzHLa75jFdBKk10z4 IdM19J3f75JQ32O/NZwWpoEF1DPCI1qy0jqbL6BCrFQJ4CPpKNab/J76L4S+aAidhmiPFa JcFEECrryhm/PxAqeZqbqSdDE2K7M0sB4dvezFL+Fmc0bkW0o1aE+Fz7u+3ZoQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1655307024; a=rsa-sha256; cv=none; b=eweS3BEYyFYQUxoXjC3r+ye9e8eO28YRXNSyOt0Cv+PHjZMU+O8MRs/91FeoTSKd79kLZF ktkHywKk6F7Qf7e3fiop8OuTVmtl1EBpirQ4p1pTj23oL5rqmdobvaR/ife7W2VsUFXqt3 MHsWlUMYtk1+o63wQ5OEucxmu9VaB+PIb6fPA5ESMEpAqd46bbfRaLLMyChpcLo7nW81md f4qpr1blcUpQPrPeG7VM1PAIxmDp3NqYPpj0BJzTRiTla3Ezt+ZsSfzTy+rChANSOebCej H5IgTryUX24dG7OmeJlGKnzug0nctdqCqMvKOyLeMrVW/a4zJ23coJoqkaTHhQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tom-fitzhenry.me.uk header.s=fm2 header.b=DhCsuKEX; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b=qafB466+; dmarc=fail reason="SPF not aligned (relaxed)" header.from=tom-fitzhenry.me.uk (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 7.41 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tom-fitzhenry.me.uk header.s=fm2 header.b=DhCsuKEX; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b=qafB466+; dmarc=fail reason="SPF not aligned (relaxed)" header.from=tom-fitzhenry.me.uk (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 47B2010285 X-Spam-Score: 7.41 X-Migadu-Scanner: scn1.migadu.com X-TUID: 2pn2prK1rQO5 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