From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id eEzvFMb8qWIORAAAbAwnHQ (envelope-from ) for ; Wed, 15 Jun 2022 17:37:42 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 4P0hFMb8qWLAUwAAG6o9tA (envelope-from ) for ; Wed, 15 Jun 2022 17:37:42 +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 D883F2249E for ; Wed, 15 Jun 2022 17:37:41 +0200 (CEST) Received: from localhost ([::1]:38616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1V5Q-0008Pd-BU for larch@yhetil.org; Wed, 15 Jun 2022 11:37:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1Uap-00005y-77 for guix-patches@gnu.org; Wed, 15 Jun 2022 11:06:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45543) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o1Uao-0003tC-UF for guix-patches@gnu.org; Wed, 15 Jun 2022 11:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o1Uao-0000An-KX for guix-patches@gnu.org; Wed, 15 Jun 2022 11:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55997] [PATCH staging 1/4] gnu: Add ruby-hydra-minimal. 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.1655305517552 (code B ref 55997); Wed, 15 Jun 2022 15:06:02 +0000 Received: (at 55997) by debbugs.gnu.org; 15 Jun 2022 15:05:17 +0000 Received: from localhost ([127.0.0.1]:39423 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1Ua5-00008q-B5 for submit@debbugs.gnu.org; Wed, 15 Jun 2022 11:05:17 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:47321) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1Ua3-00008V-3m for 55997@debbugs.gnu.org; Wed, 15 Jun 2022 11:05:15 -0400 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 529CF3200AEA; Wed, 15 Jun 2022 11:05:09 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 15 Jun 2022 11:05:09 -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= 1655305508; x=1655391908; bh=VwD15TTDedD7txTJZZ+7BYLgjisxtzxXQG6 Z7ElbQ8k=; b=ZKaI/8pcBrPmjE6J7EpVd0htfsdkVt4Lu286uwYDR0ySFnbzqiD ZtXkkjFCZsN+URil0nzfoiYncBwYCIRYcoZAKLx5vLnChIsDhi7IeAT0ZtVDrGZm 6E2+E9vegtSlazbbYLnzX40Jz1sCC/bCku+zdOQuLou1w27PCZN4rT2GcZormvTu Mc+Gn9OloXnJGEXI8LdEp8Vj9iyAU9gLMr5tcdYRLaLZxE4VHhqcyFMF+ap+nbtn u+GVm/Avl0/eaHdyMZNGM+A1h5wE8pXapXKlfdxM/0uURd8ndnLyrURbQqJbU9gQ zYz9jwAKhsUsb6YjXAUcFl+VT5WSgKs0DGw== 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=1655305508; x=1655391908; bh=VwD15TTDedD7t xTJZZ+7BYLgjisxtzxXQG6Z7ElbQ8k=; b=BZguUtABnmP/zLZFfvdID0Cn+6mRB c2m9iDnSMtIhTx9IInTlth7L7lPAJ3f/GuOhDDrjSDfPr1nUyRBw4/ndr2jaBlIq IimRQ6AbPYw78svF5pn5Zge4LgLV63oc6WMSHKwUPPXw6SlOsxLEOi5G3EuUuD6X 4L6pf7DhcLIiUzsrzj+xNQ/biRqmmXaa1y9g6TZjDcWBy860yZqij0E1hr6BMVNI yg85BAKAkjK8FLASgOgYanoDplLmwoYg1EUTpuClnK/hivV5pxqW7S90vlb/IE/+ EvejCf2ALdDCIBN7tAaPva/eenPHC/sZzB9CUn0BF5JrPIDOgl8q9yVRg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedruddvuddgkeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefvohhmucfhihhtiihhvghnrhihuceothhomhesthhomhdq fhhithiihhgvnhhrhidrmhgvrdhukheqnecuggftrfgrthhtvghrnhepueffuefgffdufe elgeehgfelgeefkefhgfegffeihfegfefhieeghfetkeeiffdvnecuffhomhgrihhnpehg ihhthhhusgdrtghomhenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrih hlfhhrohhmpehtohhmsehtohhmqdhfihhtiihhvghnrhihrdhmvgdruhhk X-ME-Proxy: Feedback-ID: iefc945ae:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 15 Jun 2022 11:05:06 -0400 (EDT) From: Tom Fitzhenry Date: Thu, 16 Jun 2022 01:04:31 +1000 Message-Id: <20220615150434.11604-1-tom@tom-fitzhenry.me.uk> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220615145805.3189-1-tom@tom-fitzhenry.me.uk> References: <20220615145805.3189-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=1655307462; 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=VwD15TTDedD7txTJZZ+7BYLgjisxtzxXQG6Z7ElbQ8k=; b=oEyvcLgqpaLOTsq2HjQTL4hMpyQaXNkZ32/ogGmt39buC1aKKfRKPiUfQ9GZwja4AxbdPv q/pCSg73QrN1kfRr5WgFTjqI1dlOyFlzJUFku/nSKE0do9y8/8S0fDlQRKuIZ9pSpbQ33Z Rb/ygw65rlC8Xabw0eiIPtmlzjNnr5PfVNND59XzzLa8qw614jOvUFVtqtVvuCqiO/9pg0 8j302SpVLctiJOxzCz0/qMK6gCDcSwFbq/bNppa03ZdMH87JRYJal0PXx8nu94QwTSXLAT GziZBJmPO5skwLPgqKTCpbwlnzE/F2pZLW+NnLTOOO3DPNEx09QuSjdPzP+mRA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1655307462; a=rsa-sha256; cv=none; b=XiBDbG1i/USHLz8bUWit0ByxBuxFUkOtf9SPJzVoZ3QHJ1D67SoPtKlqUReG6iDwgSCXeW f815G8jB519KmZsToZd5JuolnvU71gTEuXz+JNW49n4kexXJcKIq7gWUoZy7OTw/DWAxtu ZTuPwEWZVdZVa1Q2/xHFbpcgKftmoMER3M9QaaHvrXdEM7NOEOw5r9oANkSvY2VjF9l+Rr cL4B2+jZSf5Ev/6HRif6NUE/kJlMeY8ylPhisUqCw6256yQC8h0aLJjqYV/srPesPAOCIW PPhsPy+975WUc3RmspQ2i+qUGyzGQv0gqbs7Xov3hVA/82FX7x0RIL+oblu4ZQ== 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="ZKaI/8pc"; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b=BZguUtAB; 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: 5.91 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tom-fitzhenry.me.uk header.s=fm2 header.b="ZKaI/8pc"; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm2 header.b=BZguUtAB; 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: D883F2249E X-Spam-Score: 5.91 X-Migadu-Scanner: scn0.migadu.com X-TUID: Bua3mlNXzql3 * gnu/packages/patches/ruby-hydra-no-byebug.patch: New file. * gnu/packages/ruby.scm (ruby-hydra): Refactor to inherit from ruby-hydra-minimal. (ruby-hydra-minimal): New variable. --- .../patches/ruby-hydra-no-byebug.patch | 9 +++++ gnu/packages/ruby.scm | 35 +++++++++++++------ 2 files changed, 33 insertions(+), 11 deletions(-) create mode 100644 gnu/packages/patches/ruby-hydra-no-byebug.patch diff --git a/gnu/packages/patches/ruby-hydra-no-byebug.patch b/gnu/packages/patches/ruby-hydra-no-byebug.patch new file mode 100644 index 0000000000..902d32a30a --- /dev/null +++ b/gnu/packages/patches/ruby-hydra-no-byebug.patch @@ -0,0 +1,9 @@ +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 54dcae9089..2622bf717a 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -3124,24 +3124,39 @@ (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-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 +3164,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 -- 2.36.1