From patchwork Sun Jun 18 11:28:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 51037 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 DA49F27BBE9; Sun, 18 Jun 2023 12:30:24 +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.9 required=5.0 tests=BAYES_00,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 9B67727BBE2 for ; Sun, 18 Jun 2023 12:30:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAqbj-00063k-MG; Sun, 18 Jun 2023 07:30:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qAqbd-00060W-PJ for guix-patches@gnu.org; Sun, 18 Jun 2023 07:30:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qAqbd-0003o8-G3 for guix-patches@gnu.org; Sun, 18 Jun 2023 07:30:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qAqbd-0003l3-Aa; Sun, 18 Jun 2023 07:30:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64150] [PATCH 05/24] gnu: texlive-hyphen-package: Use pinned ruby-hydra-minimal. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: mail@cbaines.net, rekado@elephly.net, guix-patches@gnu.org Resent-Date: Sun, 18 Jun 2023 11:30:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64150@debbugs.gnu.org Cc: Christopher Baines , Christopher Baines , Ricardo Wurmus X-Debbugs-Original-Xcc: Christopher Baines , Ricardo Wurmus Received: via spool by 64150-submit@debbugs.gnu.org id=B64150.168708774413952 (code B ref 64150); Sun, 18 Jun 2023 11:30:05 +0000 Received: (at 64150) by debbugs.gnu.org; 18 Jun 2023 11:29:04 +0000 Received: from localhost ([127.0.0.1]:53331 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAqae-0003cr-Ab for submit@debbugs.gnu.org; Sun, 18 Jun 2023 07:29:04 -0400 Received: from mira.cbaines.net ([212.71.252.8]:42680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAqaT-0003ZH-It for 64150@debbugs.gnu.org; Sun, 18 Jun 2023 07:28:55 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:3a91:a0a4:ecee:f157]) by mira.cbaines.net (Postfix) with ESMTPSA id 2759C27BBEC; Sun, 18 Jun 2023 12:28:53 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id afe8b32a; Sun, 18 Jun 2023 11:28:52 +0000 (UTC) From: Christopher Baines Date: Sun, 18 Jun 2023 12:28:32 +0100 Message-Id: <61932bba225fd1bde719f00d356938b1fe60b232.1687087731.git.mail@cbaines.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <87leghko6e.fsf@cbaines.net> References: <87leghko6e.fsf@cbaines.net> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches To allow updating ruby without changing texlive. * gnu/packages/ruby.scm (ruby-hydra-minimal/pinned): New variable. * gnu/packages/tex.scm (texlive-hyphen-package)[native-inputs]: Use it Signed-off-by: Christopher Baines --- gnu/packages/ruby.scm | 9 +++++++++ gnu/packages/tex.scm | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index f28ad97e11..1de1d634bc 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3597,6 +3597,15 @@ (define-public ruby-hydra-minimal It is a low-dependency variant of ruby-hydra.") (license license:expat)))) +;; Pinned variant for use by texlive +(define-public ruby-hydra-minimal/pinned + (hidden-package + (package + (inherit ruby-hydra-minimal) + (arguments + (cons* #:ruby ruby-2.7 + (package-arguments ruby-hydra-minimal)))))) + (define-public ruby-hydra (package (inherit ruby-hydra-minimal) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 6c055ed0cd..65f8d901d7 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -236,7 +236,7 @@ (define (texlive-hyphen-package name code locations hash) (string-append "File.join(\"" ptex "\""))) (invoke "ruby" "generate-ptex-patterns.rb"))))))))) (native-inputs - (list ruby-2.7 ruby-hydra-minimal hyph-utf8-scripts)) + (list ruby-2.7 ruby-hydra-minimal/pinned hyph-utf8-scripts)) (home-page "https://ctan.org/pkg/hyph-utf8")))) (define texlive-extra-src