From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id iEbhIoqC8GXgAwEAe85BDQ:P1 (envelope-from ) for ; Tue, 12 Mar 2024 17:27:54 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id iEbhIoqC8GXgAwEAe85BDQ (envelope-from ) for ; Tue, 12 Mar 2024 17:27:54 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1710260874; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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; bh=luOa0IBQZz9YRBLOTyg9UyC3V0jjUgLTN8aAyOtK3IA=; b=UJ6u64nXy9Gg+hkRa+mFaHCLuIQ/BTYd5HjekisFyu1y0TKPwi/pJyVwXgA4pNgzrsLu75 1a/+Pkh/iz1QTENJiIeavhdMkjCqhC16BtLTJObqP59PB3Bvk5HKQgWKqn9JCURttqxDRN Xihc9YgzS5e2N5H6HY5NEXcYh4zLW+f1RCw50hZljRpaETIPu7YjryJ2SDkPr/fsE8hNp2 mtWYAZbNa9TOJjCK6a83jdCPX7x68mXuiDt/4Ns2GvDINNl/Okl3yV+WLUE1Hj6CGF5p9A 2n9JXZ01m95lpuvixvjG4b7zQDxH1rW7uv9p+0I62nwvmank70OjNle5T/YAfg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=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"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1710260874; a=rsa-sha256; cv=none; b=Xjq2xhWASSr7jpFMvCnLWIhMhmOJpmwKiNCbIIF6OoeluMMHuwT1udWTkXzLTTbhczXp23 8/6eyS4TWb18jaPYwr+phaLGofI2CflE74/SIevQV6VV6TLbyGBQSWx1USxZ/XjVGnEs/t N6AeOaNM1h7SS4Up9qA3VQFKoEzAH0p165iOLOJihpGoyEQ3hmqpSISN05iKsiWL6By68z s5yPjKaO8mjJ8OY0WF8+Y0HdPqHAROT8brbpofIGC25yPE/YajDowbd77VRerOWgH9yuDC ifAYfBsnQjAeib+MnbOn83CjnjWTA6wc7+wGMBKtBbTA197S3O8W18tcd+vTdA== 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 6432D1C78F for ; Tue, 12 Mar 2024 17:27:54 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rk4yZ-0002Zs-AV; Tue, 12 Mar 2024 12:27:39 -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 1rk4yR-0002YA-Mb for guix-patches@gnu.org; Tue, 12 Mar 2024 12:27:32 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rk4yP-0001qi-A5 for guix-patches@gnu.org; Tue, 12 Mar 2024 12:27:31 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rk4yx-000052-QT for guix-patches@gnu.org; Tue, 12 Mar 2024 12:28:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69743] [PATCH] update grimshot package definition Resent-From: Ignas =?UTF-8?Q?Lap=C4=97nas?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Mar 2024 16:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69743 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Jack Hill Cc: 69743@debbugs.gnu.org Received: via spool by 69743-submit@debbugs.gnu.org id=B69743.171026085632688 (code B ref 69743); Tue, 12 Mar 2024 16:28:03 +0000 Received: (at 69743) by debbugs.gnu.org; 12 Mar 2024 16:27:36 +0000 Received: from localhost ([127.0.0.1]:43491 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rk4yU-0008V8-Uf for submit@debbugs.gnu.org; Tue, 12 Mar 2024 12:27:36 -0400 Received: from tritonas.serveriai.lt ([194.135.87.87]:45521) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rk2a9-0006aJ-7b for 69743@debbugs.gnu.org; Tue, 12 Mar 2024 09:54:32 -0400 Received: from [88.119.78.42] (helo=thorfin) by tritonas.serveriai.lt with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rk2ZY-00079K-0u; Tue, 12 Mar 2024 15:53:40 +0200 References: <7f2ba732c3b7dd12d937e70a5f643a09ac5bfa6d.1710237367.git.ignas@lapenas.dev> User-agent: mu4e 1.10.8; emacs 29.1 From: Ignas =?UTF-8?Q?Lap=C4=97nas?= Date: Tue, 12 Mar 2024 15:33:36 +0200 In-reply-to: Message-ID: <87wmq7blp8.fsf@lapenas.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Sender: ignas@lapenas.dev X-Mailman-Approved-At: Tue, 12 Mar 2024 12:27:27 -0400 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.29 X-Spam-Score: -6.29 X-Migadu-Queue-Id: 6432D1C78F X-TUID: NIG1hA9YLeqN Hi, this is a first patch for me. Just to be clear, I'm still a newb with Guix and Guile. All feedback is greatly appreciated. Thank You :) > I'm happy to see this improvement of building the manpage from source. This part was not written by me. Last package definition version had a chdir to the contrib directory step, to correctly copy over required files. Since now the contrib directory is directly downloaded from github it was no longer necessary. (that was the part removed) > For my curiosity, what's the benefit of propagating grim? It looks > like the full bath is also being substituted in the script? While running the ./pre-inst-env to check if the package still works correctly, I had an error that grim was not found. After a quick read on the manual, noticed that propogated inputs actually copy it over. It seems that my mistake is probably due to not updating this part. #+BEGIN_EXAMPLE (add-after 'chdir 'patch-script-dependencies #+END_EXAMPLE since chdir stage was removed it might have possibly skipped other steps altogether. I'll look into it some more how it works exactly and try to provide a new patch. Jack Hill writes: > [1. text/plain] > On Tue, 12 Mar 2024, Ignas Lap=C4=97nas wrote: > >> Issue: https://issues.guix.gnu.org/69667 >> >> Grimshot was dropped from sway. >> https://github.com/swaywm/sway/issues/7405 >> >> The contrib was moved to: >> https://github.com/OctopusET/sway-contrib >> >> Package definition updated accordingly. >> >> Change-Id: I9ed9cdf7ce10fe878b4f2b931791ed22a63ff99a >> --- >> gnu/packages/wm.scm | 60 +++++++++++++++++++++++++-------------------- >> 1 file changed, 33 insertions(+), 27 deletions(-) >> >> diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm >> index edbb3096b8..eeaee0cb68 100644 >> --- a/gnu/packages/wm.scm >> +++ b/gnu/packages/wm.scm >> @@ -3524,46 +3524,52 @@ (define-public avizo > > I haven't had a chance to test on a system yet, but thanks for > preparing this, reading through it it looks good. > >> + (add-after 'patch-script-dependencies 'build-man-page >> + (lambda _ >> + (with-input-from-file "grimshot.1.scd" >> + (lambda _ >> + (with-output-to-file "grimshot.1" >> + (lambda _ >> + (invoke "scdoc")))))))))) > > I'm happy to see this improvement of building the manpage from source. > >> (native-inputs (list scdoc)) >> (inputs (list coreutils >> - grim >> jq >> libnotify >> slurp >> sway >> wl-clipboard)) >> + (propagated-inputs (list grim)) > > For my curiosity, what's the benefit of propagating grim? It looks > like the full bath is also being substituted in the script? > > Thanks! > Jack --=20 Pagarbiai, Ignas Lap=C4=97nas