From patchwork Wed Nov 1 03:16:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Cl=C3=A9ment_Lassieur?= X-Patchwork-Id: 55766 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 2E21F27BBE2; Wed, 1 Nov 2023 03:17:51 +0000 (GMT) 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=ham 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 EBE5027BBE9 for ; Wed, 1 Nov 2023 03:17:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qy1jV-0002sA-JT; Tue, 31 Oct 2023 23:17:29 -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 1qy1jU-0002ru-Im for guix-patches@gnu.org; Tue, 31 Oct 2023 23:17:28 -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 1qy1jU-0007bl-Ai for guix-patches@gnu.org; Tue, 31 Oct 2023 23:17:28 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qy1k2-0000aE-Co for guix-patches@gnu.org; Tue, 31 Oct 2023 23:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66868] [PATCH 1/2] gnu: password-store: Add missing =?utf-8?b?4oCYdGFpbOKAmQ==?= input. Resent-From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Nov 2023 03:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66868 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66868@debbugs.gnu.org, john.kehayias@protonmail.com, kaelyn.alexi@protonmail.com, mail@cbaines.net Cc: =?utf-8?q?Cl=C3=A9ment?= Lassieur Received: via spool by 66868-submit@debbugs.gnu.org id=B66868.16988086422163 (code B ref 66868); Wed, 01 Nov 2023 03:18:02 +0000 Received: (at 66868) by debbugs.gnu.org; 1 Nov 2023 03:17:22 +0000 Received: from localhost ([127.0.0.1]:49639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qy1jN-0000Yp-QA for submit@debbugs.gnu.org; Tue, 31 Oct 2023 23:17:22 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:33295) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qy1jL-0000YZ-FI for 66868@debbugs.gnu.org; Tue, 31 Oct 2023 23:17:20 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.west.internal (Postfix) with ESMTP id 5F1D0320095D; Tue, 31 Oct 2023 23:16:39 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Tue, 31 Oct 2023 23:16:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lassieur.org; h= cc:cc:content-transfer-encoding:content-type: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= 1698808598; x=1698894998; bh=TfSIQjtTZZMOalaYpUeALiJHpy/HNCfRi1K CkQDuCv8=; b=eYeCz0LhFk8vkGRFWUQ5i+msaT1weU2StqS6Sk8FGIdYG0VlLdF mYgVQ9JnugWFMuOjpbFhfhsiFiCjhYPPhAz2/vIzr8TrSs5WozjTRV4xHAVrbQEH NlNFUd1yLky9hrIGs7w4bDeS04MV3PkDedvTy+UZgxxEfYlfR/tazIDHP08u+7JO KWZi9bRz9klTS42oDubjKcoEzpuCHqVLP0OhmN7Y3j3YIBj7/y6OFXXyEitilxw5 NlfR5/PqbuewQVnH9j2KlpmeJiPtSsrrMiLG+JCt/scUqpJMmbaDTbq6g4E8CqPl uQWoTM17o0XGYIk2wZKM+TmxI/AKnO7KE8g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type: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=fm3; t= 1698808598; x=1698894998; bh=TfSIQjtTZZMOalaYpUeALiJHpy/HNCfRi1K CkQDuCv8=; b=EOkVFC0dByWWXqDzyowKtW12YFFXDBgPwbWAEWGSXJm9oRslh3N WnCcAto5GyuxG5yVe2FErUnrxHWDKlcs/UxxmQSNKuNTe5+1TuAx9eJJb/RgtYZF 9lsv1F3JWwxT7Jem9XriGC1ILiVobKoxgoVQTHnh9MZ94GBZCDdLSwAigVvCWvNk WvbuSY8XmF2rsNCnj6hVaKQOmMoEBpzjSUfMiVMRY2DX+P8/qmI0+7IBP+6idQKM oN2ZbQeDtiLoN/Q8WP8n0sPqkSSgQZBue+ttS2GRB/rNDOHPXq/RWEul1b6GT7Ev bcmIqRsm5y9a51PUQS43Wbr2VEMbtl42vvQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedruddtfedgheegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomhepvehlrohmvghnthcunfgrshhsihgvuhhruceotghlvghm vghntheslhgrshhsihgvuhhrrdhorhhgqeenucggtffrrghtthgvrhhnpeeltdehgfdvge dtfedvheehtdfhgfduhedvudetveeuvdehjeevleekveehheeileenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegtlhgvmhgvnhhtsehlrghssh hivghurhdrohhrgh X-ME-Proxy: Feedback-ID: i4c21472a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 31 Oct 2023 23:16:36 -0400 (EDT) From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Date: Wed, 1 Nov 2023 04:16:09 +0100 Message-ID: <74f73f1677c1b61d8f0abf0b680a03ab18792d75.1698808022.git.clement@lassieur.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 * gnu/packages/password-utils.scm (password-store)[arguments]: Add “tail” to the list of requisites. [inputs]: Add COREUTILS. Change-Id: I7f59e6c0abfb5396b9548edaec08d3b0a7c0eb23 --- gnu/packages/password-utils.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 9558da1dee12..385bd6498577 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -678,7 +678,7 @@ (define-public password-store (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (requisites '("getopt" "git" "gpg" "qrencode" "sed" - "tree" "which" "wl-copy" "xclip")) + "tail" "tree" "which" "wl-copy" "xclip")) (path (map (lambda (pkg) (dirname (search-input-file inputs (string-append "/bin/" pkg)))) @@ -699,7 +699,8 @@ (define-public password-store (separator #f) ;single entry (files '("lib/password-store/extensions"))))) (inputs - (list dmenu + (list coreutils + dmenu util-linux git gnupg From patchwork Wed Nov 1 03:16:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Cl=C3=A9ment_Lassieur?= X-Patchwork-Id: 55765 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 3757C27BBEA; Wed, 1 Nov 2023 03:17:48 +0000 (GMT) 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 730E727BBE2 for ; Wed, 1 Nov 2023 03:17:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qy1jV-0002sE-R0; Tue, 31 Oct 2023 23:17:29 -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 1qy1jU-0002s2-VX for guix-patches@gnu.org; Tue, 31 Oct 2023 23:17:28 -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 1qy1jU-0007br-NX for guix-patches@gnu.org; Tue, 31 Oct 2023 23:17:28 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qy1k2-0000aM-Ps for guix-patches@gnu.org; Tue, 31 Oct 2023 23:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66868] [PATCH 2/2] gnu: passff-host: Add explicit references to inputs and remove some. Resent-From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Nov 2023 03:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66868 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66868@debbugs.gnu.org, john.kehayias@protonmail.com, kaelyn.alexi@protonmail.com, mail@cbaines.net Cc: =?utf-8?q?Cl=C3=A9ment?= Lassieur Received: via spool by 66868-submit@debbugs.gnu.org id=B66868.16988086482184 (code B ref 66868); Wed, 01 Nov 2023 03:18:02 +0000 Received: (at 66868) by debbugs.gnu.org; 1 Nov 2023 03:17:28 +0000 Received: from localhost ([127.0.0.1]:49644 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qy1jU-0000Z7-3n for submit@debbugs.gnu.org; Tue, 31 Oct 2023 23:17:28 -0400 Received: from wout5-smtp.messagingengine.com ([64.147.123.21]:43627) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qy1jQ-0000Yh-Lh for 66868@debbugs.gnu.org; Tue, 31 Oct 2023 23:17:25 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 91991320095E; Tue, 31 Oct 2023 23:16:44 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Tue, 31 Oct 2023 23:16:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lassieur.org; h= cc:cc:content-transfer-encoding:content-type: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= 1698808604; x=1698895004; bh=wOTsA7yqpwfFHugAQuZiiMQkJiCPlvuCtIu l3YHsdjw=; b=JDRecLn2//0cFRUQXegdPw4oo762O4a2DFb7NVaMfT7heXVAw7p H5be0o9bw7C0adRhaPnmbolpJ8OHEUDORuae/P80/WsdvuVkabGM3a6kE2Z/GZ3k WpolbHceulMpsX84wp/NF17EMGQxiBBwOwqqevksbLbTjB8jTp6OrGAKxZoMRbw8 sEdJcYofdbONDChhewtsrSmi0u4nP9MawGqayfrBzNTzaums048fEkvwYGv7dq7F bzxIjpJZ/1SFRILnkFXK/xxzYzGCgNhz0WMHMrO96rAqBBNTFu95TCUTVAgHZnua 6alNh3KYNL7+x6SjzKvTQlQXcpdhPmKsWHg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type: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=fm3; t= 1698808604; x=1698895004; bh=wOTsA7yqpwfFHugAQuZiiMQkJiCPlvuCtIu l3YHsdjw=; b=ORON9Vp2lpUdTKSnkBxdnRubpu+Kj/vJ+Uo7Qp8uEuYOM+6iOSH tFTDGEyeM7FZuQslsUpIL4AS5WZBoezRNu4O3/fYrDVU/5cmdVP+DsChRYSUa3O2 i9CH7Tw1E1mDvUZPwDK9Q7sYghqEmvDLsyV1JrML+yyWkr+8nxZTa7BD23jOwBh4 4NrEufuPyJdwvt1lqt2jROMH4Jjm7VZVWQ6xeisv6VDgKnxjBV9Ynbbw3fE/B9FK WRjYDsutsZ3dlcqUaiA1CSTFMk6TX578lhlZDvjVlIAIUEOL89NTwyY1yntaWqag 0a6XOGHfS4rk064bufKPCmgcfuoHylgh/Sg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedruddtfedgheegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomhepvehlrohmvghnthcunfgrshhsihgvuhhruceotghlvghm vghntheslhgrshhsihgvuhhrrdhorhhgqeenucggtffrrghtthgvrhhnpeeltdehgfdvge dtfedvheehtdfhgfduhedvudetveeuvdehjeevleekveehheeileenucevlhhushhtvghr ufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegtlhgvmhgvnhhtsehlrghssh hivghurhdrohhrgh X-ME-Proxy: Feedback-ID: i4c21472a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 31 Oct 2023 23:16:42 -0400 (EDT) From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Date: Wed, 1 Nov 2023 04:16:10 +0100 Message-ID: <7b57677eb5038f21fb4cbb9fbcfbe45d61e4b096.1698808022.git.clement@lassieur.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 This removes ‘coreutils’, ‘grep’, ‘sed’, ‘which’, ‘bash-minimal’ and ‘gnu-make’ inputs, which were only used by the Makefile and install_host_app.sh. Instead of running install_host_app.sh (through ‘make’) which does a few text substitutions, do the text substitutions with Scheme code. This simplifies things and avoids unnecessary native inputs. * gnu/packages/browser-extensions.scm (passff-host)[build-system]: Change to copy-build-system. [arguments]: Copy passff.json and passff.py. Do text substitutions on them rather than running make. Refer to ‘password-store’ and ‘python’ through inputs rather than directly. [inputs]: Add PASSWORD-STORE and PYTHON. Change-Id: I8fdb757516a7c30eae36b15f2a8d91e1445b19a5 --- gnu/packages/browser-extensions.scm | 40 ++++++++++++++--------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/gnu/packages/browser-extensions.scm b/gnu/packages/browser-extensions.scm index 99dc7de109c3..ea4043f23b47 100644 --- a/gnu/packages/browser-extensions.scm +++ b/gnu/packages/browser-extensions.scm @@ -167,28 +167,26 @@ (define-public passff-host (sha256 (base32 "1p18l1jh20x4v8dj64z9qjlp96fxsl5h069iynxfpbkzj6hd74yl")))) - (build-system trivial-build-system) + (build-system copy-build-system) (arguments - (list - #:modules '((guix build utils)) - #:builder - #~(begin - (use-modules (guix build utils)) - (setenv "PATH" (string-join '(#$coreutils - #$grep - #$password-store - #$python - #$sed - #$which) "/bin:" 'suffix)) - (copy-recursively #$source ".") - (patch-shebang "src/install_host_app.sh" - (list (in-vicinity #$bash-minimal "bin"))) - (substitute* "src/install_host_app.sh" - (("(TARGET_DIR_FIREFOX=).*" all var) - (string-append var #$output "/lib/icecat/native-messaging-hosts" - "\n"))) - (invoke #$(file-append gnu-make "/bin/make") - (string-append "VERSION=" #$version) "install-unix")))) + (let ((native-manifests "lib/icecat/native-messaging-hosts")) + (list + #:install-plan + `'(("src" ,native-manifests #:include ("passff.json" "passff.py"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'substitute + (lambda _ + (substitute* "src/passff.json" + (("PLACEHOLDER") + (format #f "~a/~a/passff.py" #$output #$native-manifests))) + (substitute* "src/passff.py" + (("_VERSIONHOLDER_") #$version) + (("^COMMAND = .*") + (format #f "COMMAND = \"~a/bin/pass\"~%" + #$(this-package-input "password-store")))) + (patch-shebang "src/passff.py"))))))) + (inputs (list password-store python)) (synopsis "Host app for the WebExtension PassFF") (description "This piece of software wraps around the zx2c4 pass shell command. It has to be installed for the PassFF browser extension to work