From patchwork Fri Jun 24 11:08:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Fitzhenry X-Patchwork-Id: 40288 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 0EF1F27BBE9; Fri, 24 Jun 2022 12:10:42 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 5D25127BBEA for ; Fri, 24 Jun 2022 12:10:41 +0100 (BST) Received: from localhost ([::1]:37888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o4hCy-0008CN-GW for patchwork@mira.cbaines.net; Fri, 24 Jun 2022 07:10:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o4hCN-0007rf-Iy for guix-patches@gnu.org; Fri, 24 Jun 2022 07:10:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47253) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o4hCN-0001nS-B1 for guix-patches@gnu.org; Fri, 24 Jun 2022 07:10:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o4hCN-0003eL-5q for guix-patches@gnu.org; Fri, 24 Jun 2022 07:10:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55997] [PATCH staging v2 2/5] 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: Fri, 24 Jun 2022 11:10: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.165606895013928 (code B ref 55997); Fri, 24 Jun 2022 11:10:03 +0000 Received: (at 55997) by debbugs.gnu.org; 24 Jun 2022 11:09:10 +0000 Received: from localhost ([127.0.0.1]:41140 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4hBW-0003cU-0D for submit@debbugs.gnu.org; Fri, 24 Jun 2022 07:09:10 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:56273) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4hBI-0003bG-Sx for 55997@debbugs.gnu.org; Fri, 24 Jun 2022 07:08:57 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id D8AC55C020C; Fri, 24 Jun 2022 07:08:51 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 24 Jun 2022 07:08:51 -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= 1656068931; x=1656155331; bh=W/90hUkivCdF9ZO1C1Aui9whoU9zx9Cxjcr Ap/j/REw=; b=JxzV9icfGmoQ5obcI5viCt28HmnVUqq5QGXA/NIb8a34W3MINOJ ff5BShSAmu/6rjnDbV1Eke3VT0txf6w9BbznFdR4pu+OLu2rZbMpAkulyYnMS7or D2KfMvjEG+e62vvS5FouhaLVQvXD2RNgqK481we23j/8niz6u3BzVq3tFSnbBW5b 2HA6brdSVtKyKqynO9SdGlNZNYUeLH9pcj5s4x2SjybY2KDx7zXvi0rY4usgOtFD hXLKnZgdvfT8Rc743Jil7u2BfQyvRFEzDlnE2RzE8Az8s/EVk7WJDofBc/p3mrHo LRClnBfEp2SRyIU9nvgeZ+Z/vC4Tl6V2zKg== 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=1656068931; x=1656155331; bh=W/90hUkivCdF9 ZO1C1Aui9whoU9zx9CxjcrAp/j/REw=; b=NAmj6i3LorpKDC+CimKoLPFJBeiHs LCKZvXKPfHm/1XpIQSRvSQseD1XYSWjfXoQVauxOrtJTQkMNZG458TEx1IEYQFY/ Tl9hjbIDfQty+O1gPOpmqUZ6GHWFBGcePkEC2Njg+i6/hAeRSsHdp3aCy6a3y+QS hlxJBGyxRnnM+AOID1YqxZwp2dbYYxvakViQ+eIQ6P49C/EUhLp76mc4tso3bo/F Mcwf9rEtUjUxv05W5prsz67VywfQvPCNtqgRS4481QNxVNnPLuqUGK4gEt9oSA3q XrQe5QbZ7E55O3cWJ5sq8BmrpofQ2KPA0nlTHG6zBB1LsIuwAbuZHukqA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrudefledgfeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefvohhmucfhihhtiihhvghnrhihuceothhomhesthhomhdq fhhithiihhgvnhhrhidrmhgvrdhukheqnecuggftrfgrthhtvghrnhepueelhfdttdeiff etieeltdfgteevueejieeuieehuefhkedtfeeujeeutdekudejnecuffhomhgrihhnpehg nhhurdhorhhgpdgtthgrnhdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrh grmhepmhgrihhlfhhrohhmpehtohhmsehtohhmqdhfihhtiihhvghnrhihrdhmvgdruhhk X-ME-Proxy: Feedback-ID: iefc945ae:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 24 Jun 2022 07:08:50 -0400 (EDT) From: Tom Fitzhenry Date: Fri, 24 Jun 2022 21:08:35 +1000 Message-Id: <20220624110838.21580-3-tom@tom-fitzhenry.me.uk> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220624110838.21580-1-tom@tom-fitzhenry.me.uk> References: <20220624110838.21580-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/local.mk (dist_patch_DATA): Add texlive-hyph-utf8-no-byebug.patch. * 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. --- gnu/local.mk | 1 + .../patches/texlive-hyph-utf8-no-byebug.patch | 13 +++++++++++++ gnu/packages/tex.scm | 3 ++- 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/texlive-hyph-utf8-no-byebug.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6653ff0240..c2fd5a1cf1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1845,6 +1845,7 @@ dist_patch_DATA = \ %D%/packages/patches/telegram-purple-adjust-test.patch \ %D%/packages/patches/texi2html-document-encoding.patch \ %D%/packages/patches/texi2html-i18n.patch \ + %D%/packages/patches/texlive-hyph-utf8-no-byebug.patch \ %D%/packages/patches/thefuck-test-environ.patch \ %D%/packages/patches/tidy-CVE-2015-5522+5523.patch \ %D%/packages/patches/timescaledb-flaky-test.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..fb29b76ef2 --- /dev/null +++ b/gnu/packages/patches/texlive-hyph-utf8-no-byebug.patch @@ -0,0 +1,13 @@ +Description: Avoid dependency on byebug to reduce package closure + significantly, see https://issues.guix.gnu.org/55997 +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 de0a6d347c..2eb27fa057 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"))))