From patchwork Mon Jan 24 09:10:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 36783 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 D4A0C27BBEA; Mon, 24 Jan 2022 09:11:32 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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 9573227BBE9 for ; Mon, 24 Jan 2022 09:11:32 +0000 (GMT) Received: from localhost ([::1]:49078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nBvNr-0001pa-Pe for patchwork@mira.cbaines.net; Mon, 24 Jan 2022 04:11:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58794) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nBvNQ-0001g9-5v for guix-patches@gnu.org; Mon, 24 Jan 2022 04:11:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49132) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nBvNO-0004Ka-Bt for guix-patches@gnu.org; Mon, 24 Jan 2022 04:11:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nBvNO-0002zD-8O for guix-patches@gnu.org; Mon, 24 Jan 2022 04:11:02 -0500 Subject: bug#53270: [PATCH] gnu: Add yubikey-oath-dmenu. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Mon, 24 Jan 2022 09:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 53270 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: John Kehayias Cc: "53270@debbugs.gnu.org" <53270-done@debbugs.gnu.org>, Maxime Devos Mail-Followup-To: 53270@debbugs.gnu.org, ludo@gnu.org, john.kehayias@protonmail.com Received: via spool by 53270-done@debbugs.gnu.org id=D53270.164301541011400 (code D ref 53270); Mon, 24 Jan 2022 09:11:02 +0000 Received: (at 53270-done) by debbugs.gnu.org; 24 Jan 2022 09:10:10 +0000 Received: from localhost ([127.0.0.1]:42033 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nBvMY-0002xo-CD for submit@debbugs.gnu.org; Mon, 24 Jan 2022 04:10:10 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:41750) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nBvMX-0002wr-4c for 53270-done@debbugs.gnu.org; Mon, 24 Jan 2022 04:10:09 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 7C56C2FE; Mon, 24 Jan 2022 10:10:02 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8aR-rq55mICc; Mon, 24 Jan 2022 10:10:01 +0100 (CET) Received: from ribbon (91-160-117-201.subs.proxad.net [91.160.117.201]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 467322F; Mon, 24 Jan 2022 10:10:01 +0100 (CET) From: Ludovic =?utf-8?q?Court=C3=A8s?= References: <3d5ccfc962993cc5d5af18e49feb23e3c14765ca.camel@telenet.be> Date: Mon, 24 Jan 2022 10:10:00 +0100 In-Reply-To: (John Kehayias's message of "Sat, 15 Jan 2022 19:52:50 +0000") Message-ID: <8735ldxzx3.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Spamd-Bar: / Authentication-Results: hera.aquilenet.fr; none X-Rspamd-Server: hera X-Rspamd-Queue-Id: 7C56C2FE X-Spamd-Result: default: False [-0.10 / 15.00]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; FREEMAIL_ENVRCPT(0.00)[protonmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[multipart/mixed,text/plain,text/x-patch]; TO_DN_ALL(0.00)[]; FREEMAIL_TO(0.00)[protonmail.com]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:+]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] 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 Hi, John Kehayias skribis: > From a5958b588cebd23012d7d9cbeb8f1e22a3802ea2 Mon Sep 17 00:00:00 2001 > From: John Kehayias > Date: Fri, 14 Jan 2022 16:11:47 -0500 > Subject: [PATCH] gnu: Add yubikey-oath-dmenu. > > * gnu/packages/security-token.scm (yubikey-oath-dmenu): New variable. Applied. I took the liberty to make the change below, to avoid using a non-literal string as the ‘substitute*’ pattern (it’s possible to use a non-literal string but more error prone). Thanks John and Maxime! Ludo’. diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index b2f9f83ba2..8190e1e1e2 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -471,14 +471,12 @@ (define-public yubikey-oath-dmenu (delete 'build) ; or build (add-after 'unpack 'fix-paths (lambda* (#:key inputs #:allow-other-keys) - (for-each (lambda (tool) - (substitute* "yubikey-oath-dmenu.py" - (((string-append "'" tool)) - (string-append - "'" - (search-input-file inputs - (string-append "/bin/" tool)))))) - (list "dmenu" "notify-send" "wl-copy" "xclip" "xdotool")))) + (substitute* "yubikey-oath-dmenu.py" + (("'(dmenu|notify-send|wl-copy|xclip|xdotool)" _ tool) + (string-append + "'" + (search-input-file inputs + (string-append "/bin/" tool))))))) (replace 'install (lambda _ (invoke "make" "install"