From patchwork Fri Jun 24 11:08:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Fitzhenry X-Patchwork-Id: 40286 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 3157027BBEA; Fri, 24 Jun 2022 12:10:15 +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 1E79927BBE9 for ; Fri, 24 Jun 2022 12:10:14 +0100 (BST) Received: from localhost ([::1]:37410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o4hCX-0007sD-8Z for patchwork@mira.cbaines.net; Fri, 24 Jun 2022 07:10:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o4hCN-0007rS-8K for guix-patches@gnu.org; Fri, 24 Jun 2022 07:10:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47252) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o4hCM-0001mc-WB 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 1o4hCM-0003eD-MJ for guix-patches@gnu.org; Fri, 24 Jun 2022 07:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55997] [PATCH staging v2 1/5] gnu: Add ruby-hydra-minimal. Resent-From: Tom Fitzhenry Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Jun 2022 11:10: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.165606895013916 (code B ref 55997); Fri, 24 Jun 2022 11:10:02 +0000 Received: (at 55997) by debbugs.gnu.org; 24 Jun 2022 11:09:10 +0000 Received: from localhost ([127.0.0.1]:41129 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4hBI-0003bU-V1 for submit@debbugs.gnu.org; Fri, 24 Jun 2022 07:09:09 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:58023) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4hBH-0003bE-7h for 55997@debbugs.gnu.org; Fri, 24 Jun 2022 07:08:55 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 3825D5C020D; Fri, 24 Jun 2022 07:08:50 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Fri, 24 Jun 2022 07:08:50 -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= 1656068930; x=1656155330; bh=7CFzVTntzlJW8Fqndw6lIkd3CVMprjsaBrX FWKElGFY=; b=J72m9U0IXgoZ6j8DMu8/6pOlXxYOo9gfFcqW/q44H4rFw8MyHBl yuoMEdCLYSh6gc9yEan009OIAN+XCxZVYh4PZoO7O/H/BM7xo/dp1FLiKuqtVDC8 ugy8dqsb7oiTXQrdsLKeCjDIr5Iw/VpmAaAKB4y8CyoJtXPa531Tix14gyG1vEE/ NfrjrQ9CiacGt4RnHlOFQHcbzUCx4x75WH2b+GiBnz6mfgg5l4ULbKS/AfWAw0R+ L+pjTFn+EQHuXBBuX6V2NQm3T7XSFTb+NZt3d+sv0B7Tb4vaS0qBN2z8TW148Q8e LAi54tDjDV45Cuo8+WHyW+SKp2FM2WRWJSw== 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=1656068930; x=1656155330; bh=7CFzVTntzlJW8 Fqndw6lIkd3CVMprjsaBrXFWKElGFY=; b=xnEnUSZH5OT4tltqhEURtgmmDmlYD am7gEPgkZUp5Og+CQgB94OaVxD7nUN7h1abJPu1FFMwjpPxqFrkVqSFs9MmqdkQ8 wur63MICweebg3CncrI+8uTRpcbeUppLYHlqWyYIVjgrShfLdwfO6OnjW3fkCzdL fwvhgbhSr/Q4YY/AhGTW02/bH9XKXZ5pJ4fqFtwxfBWMeQqeECNJK4ElhdiMISxJ 7bFtDEmXGfHyDl0JpNg7vRIYpCZY51S0IwkKtf7lM4xFOaYt2QOEbk+L204pYHXl lrkuQpLcWtQzmd1OjOL/nzefgN3OgSpLIH+8ATnCNxomC7lMc/Fql1L2g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrudefledgfeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefvohhmucfhihhtiihhvghnrhihuceothhomhesthhomhdq fhhithiihhgvnhhrhidrmhgvrdhukheqnecuggftrfgrthhtvghrnhepvdehfeevtdejff efhfejudelhfefudehieegveffgeejvdetgeeuleehgefgfeeinecuffhomhgrihhnpehg nhhurdhorhhgpdhgihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurf grrhgrmhepmhgrihhlfhhrohhmpehtohhmsehtohhmqdhfihhtiihhvghnrhihrdhmvgdr uhhk X-ME-Proxy: Feedback-ID: iefc945ae:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 24 Jun 2022 07:08:48 -0400 (EDT) From: Tom Fitzhenry Date: Fri, 24 Jun 2022 21:08:34 +1000 Message-Id: <20220624110838.21580-2-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 * gnu/local.mk (dist_patch_DATA): Add ruby-hydra-minimal-no-byebug.patch. * gnu/packages/patches/ruby-hydra-minimal-no-byebug.patch: New file. * gnu/packages/ruby.scm (ruby-hydra): Refactor to inherit from ruby-hydra-minimal. (ruby-hydra-minimal): New variable. --- gnu/local.mk | 1 + .../ruby-hydra-minimal-no-byebug.patch | 11 ++++++ gnu/packages/ruby.scm | 36 +++++++++++++------ 3 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 gnu/packages/patches/ruby-hydra-minimal-no-byebug.patch diff --git a/gnu/local.mk b/gnu/local.mk index f8ccbd34ec..6653ff0240 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1767,6 +1767,7 @@ dist_patch_DATA = \ %D%/packages/patches/rocm-comgr-3.1.0-dependencies.patch \ %D%/packages/patches/rocm-opencl-runtime-4.3-noclinfo.patch \ %D%/packages/patches/rocm-opencl-runtime-4.3-noopencl.patch \ + %D%/packages/patches/ruby-hydra-minimal-no-byebug.patch \ %D%/packages/patches/ruby-mustache-1.1.1-fix-race-condition-tests.patch \ %D%/packages/patches/ruby-sanitize-system-libxml.patch \ %D%/packages/patches/rustc-1.39.0-src.patch \ diff --git a/gnu/packages/patches/ruby-hydra-minimal-no-byebug.patch b/gnu/packages/patches/ruby-hydra-minimal-no-byebug.patch new file mode 100644 index 0000000000..7b338ca03e --- /dev/null +++ b/gnu/packages/patches/ruby-hydra-minimal-no-byebug.patch @@ -0,0 +1,11 @@ +Description: Avoid dependency on byebug to reduce package closure + significantly, see https://issues.guix.gnu.org/55997 +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 800ab194fe..4c66e14a68 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3124,24 +3124,40 @@ (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-minimal-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 +3165,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 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")))) From patchwork Fri Jun 24 11:08:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Fitzhenry X-Patchwork-Id: 40287 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 C991E27BBEA; Fri, 24 Jun 2022 12:10:16 +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 9305627BBE9 for ; Fri, 24 Jun 2022 12:10:16 +0100 (BST) Received: from localhost ([::1]:37460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o4hCZ-0007uf-Pf for patchwork@mira.cbaines.net; Fri, 24 Jun 2022 07:10:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o4hCO-0007sA-Nm for guix-patches@gnu.org; Fri, 24 Jun 2022 07:10:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47255) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o4hCO-0001o0-FV for guix-patches@gnu.org; Fri, 24 Jun 2022 07:10:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o4hCO-0003ec-AD for guix-patches@gnu.org; Fri, 24 Jun 2022 07:10:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55997] [PATCH staging v2 3/5] gnu: Unpin ruby-nokogiri-diff's ruby-nokogiri Resent-From: Tom Fitzhenry Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Jun 2022 11:10:04 +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.165606895113942 (code B ref 55997); Fri, 24 Jun 2022 11:10:04 +0000 Received: (at 55997) by debbugs.gnu.org; 24 Jun 2022 11:09:11 +0000 Received: from localhost ([127.0.0.1]:41144 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4hBX-0003ci-0e for submit@debbugs.gnu.org; Fri, 24 Jun 2022 07:09:11 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:34245) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4hBK-0003bJ-Gp for 55997@debbugs.gnu.org; Fri, 24 Jun 2022 07:08:58 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 7D5035C0209; Fri, 24 Jun 2022 07:08:53 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 24 Jun 2022 07:08:53 -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= 1656068933; x=1656155333; bh=P3JoWtZrrvdKutc1/S2ZcESMz8FYMVIUgVy v1gz5xJA=; b=OGQmPhoYcZjPa8C4V+mtwVqa2pXE2QztlbWHpZ9hC+57i1Pnq4j jqxH2QIQUeesmpEfLQsb6vkY5Jk7FtV14YCvnhlV2ys2CljHO2OBXF5NZR+PmD9x fZM4+JDZQQ6GZE/5vENcKF7yif0nL8z225nuGhZMt155MBjMgMX0SfucUejvkTsR C9F4sOvhgqTJLsX9BabuRgOYORvx7Wr6JMhja4LUIUEsrzgyUFkCyly/zhhZXKCQ IwuFe/jke6sNR8OchDJrS78bbDehBkZXO3ktVJHN1EDnqFAljjXJeJYvQ13pr7q5 4UtjjMO7FXxDTyhYNaAU9bl9SorT5O4skyQ== 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=1656068933; x=1656155333; bh=P3JoWtZrrvdKu tc1/S2ZcESMz8FYMVIUgVyv1gz5xJA=; b=QlgMhPOykWoivM33uCKvUTbkOmZ06 vc/0REVCT/06uk0K2PZ6UrloQ+r4eEdbvX98P/itDxTnkjyxpMQoFPs5gk9gQJ2m m7DkGkGBPVF5n72tGb9luXhTiBai0mwpBrjvNqrIu1xkuvzA6vkR4QvzwmU9J75B midXFBLfjN2k/1S5l7Pchdv0WBdAkBrOPoUKJui4NHgpKUq4n/ArPlqm6siNMnRx Jf7tFBpwK3Ybt/N+ce5SZD/oh/W7/a0LkTzg4kQiClbTO5I/J59mWr8M4Jw3sOHw vMOeW9cJVUVxkI4OTBXpgx2NhxhUlO6K3YFEx4/tPZh23mW95JyNylAYg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrudefledgfeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefvohhmucfhihhtiihhvghnrhihuceothhomhesthhomhdq fhhithiihhgvnhhrhidrmhgvrdhukheqnecuggftrfgrthhtvghrnhepfeegjeetveegie elhfegtdettedvvdegkedugfdtueejvefffeeutdejjeelhfefnecuvehluhhsthgvrhfu ihiivgepudenucfrrghrrghmpehmrghilhhfrhhomhepthhomhesthhomhdqfhhithiihh gvnhhrhidrmhgvrdhukh X-ME-Proxy: Feedback-ID: iefc945ae:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 24 Jun 2022 07:08:52 -0400 (EDT) From: Tom Fitzhenry Date: Fri, 24 Jun 2022 21:08:36 +1000 Message-Id: <20220624110838.21580-4-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 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 4c66e14a68..7119898fbc 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -6740,8 +6740,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 Fri Jun 24 11:08:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tom Fitzhenry X-Patchwork-Id: 40289 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 1B67B27BBEA; Fri, 24 Jun 2022 12:10:43 +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 67BA827BBE9 for ; Fri, 24 Jun 2022 12:10:42 +0100 (BST) Received: from localhost ([::1]:37956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o4hCz-0008F4-IO for patchwork@mira.cbaines.net; Fri, 24 Jun 2022 07:10:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o4hCP-0007sy-6w for guix-patches@gnu.org; Fri, 24 Jun 2022 07:10:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47256) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o4hCO-0001oE-UB for guix-patches@gnu.org; Fri, 24 Jun 2022 07:10:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o4hCO-0003ej-P7 for guix-patches@gnu.org; Fri, 24 Jun 2022 07:10:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55997] [PATCH staging v2 4/5] gnu: Remove unused ruby-nokogiri-1.10. Resent-From: Tom Fitzhenry Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Jun 2022 11:10:04 +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.165606895113950 (code B ref 55997); Fri, 24 Jun 2022 11:10:04 +0000 Received: (at 55997) by debbugs.gnu.org; 24 Jun 2022 11:09:11 +0000 Received: from localhost ([127.0.0.1]:41146 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4hBX-0003cp-9Q for submit@debbugs.gnu.org; Fri, 24 Jun 2022 07:09:11 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:36121) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4hBM-0003bL-5A for 55997@debbugs.gnu.org; Fri, 24 Jun 2022 07:09:00 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 24FA15C0208; Fri, 24 Jun 2022 07:08:55 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Fri, 24 Jun 2022 07:08:55 -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=1656068935; x=1656155335; bh=1Zv1ugHxPK NzHwWWw7XTpS8iEWepdyCeSMld4N2cXkE=; b=fpuug/4S59X3+evLWABpl8hM8O wcWxQzxCi8FSgFygf0FBdiueiB949lnLgG38bwXv7uw8O5EeWAOGnUbB+gf8GYMM 6jRnsbVst1Yb24Tr98p7T5BfCWaOBWp6pYsfCAyuvn1/ZbYV2X+VfnqDCem0W0wU LTfRPuSoSO568zv3/htoHAw0Pcj/vtGyi1RJTNVs3K0ZJCUb8BWFa5/Uvkg7s3o5 0RcmyU6EjeuMD6Ki0ocdMxFZWJK4TBc98OWNu2ZPLx1bTBzRw0AFrBETe5iayj6V cy1yRLvyz1D6AGBTyT33VWHB8I/e8/LYZJtk46EhbOgLBlAdRjk2nIwW8VPw== 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=1656068935; x= 1656155335; bh=1Zv1ugHxPKNzHwWWw7XTpS8iEWepdyCeSMld4N2cXkE=; b=l 2/bqsUOR5JBUvfIFtzt1dpF6qq2VSLHNYDTVFkQcnCM3OmMZeYXwluedGpgj/Dgr F6xDcRzqAZAvjZrlN9l1/6BOsEil9xMJHicdE2NY/7mlua4rl8KBSIMH4kwhEosR dJ3vULfcXgtZO8a+Eogqqw6G4Nhs/9D467LL7uogk5dTQ8KD9I4iV5AXG4QnoRCr cdra7qw2P9liOWAnCAy71+atAVCYuNgayVIFC9HaLLPpFawhrAe/E3q0iwc2E2vC GY5DXiiJYWMzT5kRQMIPQNG8S7/K7dl9Fv7lTOX2U5iLbIesSseU8m1uH3dqv9JP nMIJJM1JuzGI5v0wrbzfg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrudefledgfeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomhepvfhomhcuhfhithiihhgvnhhrhicuoehtohhmsehtohhm qdhfihhtiihhvghnrhihrdhmvgdruhhkqeenucggtffrrghtthgvrhhnpeeugeeiieekue eijeelvdduhedukeffteduhfelvdegjedvjeeileetheetffdtfeenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehtohhmsehtohhmqdhfihhtii hhvghnrhihrdhmvgdruhhk X-ME-Proxy: Feedback-ID: iefc945ae:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 24 Jun 2022 07:08:53 -0400 (EDT) From: Tom Fitzhenry Date: Fri, 24 Jun 2022 21:08:37 +1000 Message-Id: <20220624110838.21580-5-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 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 7119898fbc..d765a2c8ff 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -5031,19 +5031,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, @@ -5052,28 +5049,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.") @@ -5092,26 +5074,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") From patchwork Fri Jun 24 11:08:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Fitzhenry X-Patchwork-Id: 40290 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 2619C27BBEA; Fri, 24 Jun 2022 12:11: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=-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 C6DDC27BBE9 for ; Fri, 24 Jun 2022 12:11:29 +0100 (BST) Received: from localhost ([::1]:38694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o4hDk-0000Yg-VH for patchwork@mira.cbaines.net; Fri, 24 Jun 2022 07:11:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59476) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o4hCP-0007u3-M7 for guix-patches@gnu.org; Fri, 24 Jun 2022 07:10:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47257) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o4hCP-0001oT-Cb for guix-patches@gnu.org; Fri, 24 Jun 2022 07:10:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o4hCP-0003er-8H for guix-patches@gnu.org; Fri, 24 Jun 2022 07:10:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55997] [PATCH staging v2 5/5] gnu: texlive-hyphen-package: Remove input labels. Resent-From: Tom Fitzhenry Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Jun 2022 11:10:05 +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.165606895213956 (code B ref 55997); Fri, 24 Jun 2022 11:10:05 +0000 Received: (at 55997) by debbugs.gnu.org; 24 Jun 2022 11:09:12 +0000 Received: from localhost ([127.0.0.1]:41148 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4hBX-0003cx-Ob for submit@debbugs.gnu.org; Fri, 24 Jun 2022 07:09:12 -0400 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:56681) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o4hBN-0003bS-P6 for 55997@debbugs.gnu.org; Fri, 24 Jun 2022 07:09:02 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id BAED15C0200; Fri, 24 Jun 2022 07:08:56 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Fri, 24 Jun 2022 07:08:56 -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= 1656068936; x=1656155336; bh=INZvF9rXUtOQraffPS/DL2CA6dQBxstO+Fl YIIgwOt8=; b=Bj7qA9nOPx1Xe/KJNABCaOaLuFYQwrmXxMumJGcUPTH/Fgccdbc 75OJm3Ry1BPoAkADW+yVB+xJ/Jazx/v/7Ey425Ubikp9DZWPX37NXdTmYb9S/etl 0mkOJmnB3VKw6UIV01P3dr/sMHqWi48EYTkO5noUfVWBbEpJuzHFRRo+YE86ugRh pXT+ykRdRmLTFl70GfbaObzouY3M6bwNJLp/3blhqeXPkUgOwb+5dRnU8V/RXVPL t4v6A5ImUNxdkxtlho+0o3mA0RjdnG5UaPsb3ozRri6KrQVeFhQ59hCPkPwKsrfn VTbFXVhmz+VkRpTA/FEYLd9Q84OxXsGqU2w== 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=1656068936; x=1656155336; bh=INZvF9rXUtOQr affPS/DL2CA6dQBxstO+FlYIIgwOt8=; b=V2ArUai0Gk4Sl+hfOAy54op7SIyo8 rVFGE9RUg31maxUryspWq2gSUz5QyYX6UAcElD5R3iyp63p6x8CuubQS5lABlJ1I dxCd/+/d15Fqx6tGc4cphGEId3TKeQNOlOHNReFUXx5KlEOPwwl6BRrPF3kno2Iu evPPkT8PqEFfcfBA+EzyYDOX/O/cIyF95/88CVVQBoaxc8O/yJdfwWLpZda+1pU6 lQjPGmC3/kXc08hQelJf1lUKHFWwakX2cGY7oAxAw3ie/Pas4aX7X/R2slzZM+jU s6I6vAKtSueHCTic6scL8KFlTQUiQquYjWwYwJTg7yUbIzHABTYZk8oTw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrudefledgfeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefvohhmucfhihhtiihhvghnrhihuceothhomhesthhomhdq fhhithiihhgvnhhrhidrmhgvrdhukheqnecuggftrfgrthhtvghrnhepgeetudfhgeekle ekgeekgeeghfdvfffgudfftedvhfduudevffdvheelueehgfdunecuffhomhgrihhnpegt thgrnhdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfh hrohhmpehtohhmsehtohhmqdhfihhtiihhvghnrhihrdhmvgdruhhk X-ME-Proxy: Feedback-ID: iefc945ae:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 24 Jun 2022 07:08:55 -0400 (EDT) From: Tom Fitzhenry Date: Fri, 24 Jun 2022 21:08:38 +1000 Message-Id: <20220624110838.21580-6-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 * gnu/packages/tex.scm (texlive-hyphen-package): Remove input labels. --- gnu/packages/tex.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 2eb27fa057..e7f20bbea3 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -187,7 +187,8 @@ (define (texlive-hyphen-package name code locations hash) (string-append root "/tex/generic/hyph-utf8/patterns/quote"))) (mkdir "scripts") (copy-recursively - (assoc-ref inputs "hyph-utf8-scripts") "scripts") + (dirname (search-input-file inputs "hyph-utf8.rb")) + "scripts") ;; Prepare target directories (mkdir-p patterns) @@ -225,9 +226,7 @@ (define (texlive-hyphen-package name code locations hash) (string-append "File.join(\"" ptex "\""))) (invoke "ruby" "generate-ptex-patterns.rb"))))))))) (native-inputs - `(("ruby" ,ruby) - ("ruby-hydra-minimal" ,ruby-hydra-minimal) - ("hyph-utf8-scripts" ,hyph-utf8-scripts))) + (list ruby ruby-hydra-minimal hyph-utf8-scripts)) (home-page "https://ctan.org/pkg/hyph-utf8")))) (define texlive-extra-src