From patchwork Sat Jan 15 19:52:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 36396 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 8AD4F27BBEA; Sat, 15 Jan 2022 19:54:10 +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,FREEMAIL_FROM,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 0633F27BBE9 for ; Sat, 15 Jan 2022 19:54:10 +0000 (GMT) Received: from localhost ([::1]:33408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n8p7p-0006I5-3s for patchwork@mira.cbaines.net; Sat, 15 Jan 2022 14:54:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48494) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n8p7i-0006HC-LF for guix-patches@gnu.org; Sat, 15 Jan 2022 14:54:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:49038) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n8p7i-00058h-Bt for guix-patches@gnu.org; Sat, 15 Jan 2022 14:54:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n8p7i-0008U5-9y for guix-patches@gnu.org; Sat, 15 Jan 2022 14:54:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53270] [PATCH v2] gnu: Add yubikey-oath-dmenu. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 15 Jan 2022 19:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53270 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Cc: "53270@debbugs.gnu.org" <53270@debbugs.gnu.org> Received: via spool by 53270-submit@debbugs.gnu.org id=B53270.164227638832541 (code B ref 53270); Sat, 15 Jan 2022 19:54:02 +0000 Received: (at 53270) by debbugs.gnu.org; 15 Jan 2022 19:53:08 +0000 Received: from localhost ([127.0.0.1]:41941 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8p6l-0008Sg-BE for submit@debbugs.gnu.org; Sat, 15 Jan 2022 14:53:08 -0500 Received: from mail-40134.protonmail.ch ([185.70.40.134]:31563) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n8p6i-0008SA-K8 for 53270@debbugs.gnu.org; Sat, 15 Jan 2022 14:53:01 -0500 Date: Sat, 15 Jan 2022 19:52:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail2; t=1642276373; bh=jM14SeGFy9JHRy/9uGHj2gPbhJ4v6eUSMa1uDJyMU/I=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:From:To:Cc; b=rBzgkYFf3J8JYwex++LSgyyU+euu8TFzfIy03pvL3FEX1GzxCec4Z2KpyqJwujVj7 fB+Me6EpC+7hSfrzWxhrjd3JaxArgJ6JzJarSe+jiy3744WNSlxkI4LvdbWyv4iH0t GlkH+NVNAGRMlp2M9KuUTwuFGCo0NmD170NJpbCEum3s6SZmDeoRVAsbFQwUY2rx8H q860BYN0vDk48mwJxGG9M6AHxQHBSXfoezjApE372wpBNogryYf0ZzN6DjKANp8B5C NuKfRjbrJDkMtL0pO65fK74oZMfPr+ykjyc4x5uFwbERQ5Pfj7/+q0Q9QhoesyKXmS 0JSYYtxnmAVZQ== Message-ID: In-Reply-To: <3d5ccfc962993cc5d5af18e49feb23e3c14765ca.camel@telenet.be> References: <3d5ccfc962993cc5d5af18e49feb23e3c14765ca.camel@telenet.be> 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" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Hi Maxime, ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐ On Saturday, January 15th, 2022 at 6:27 AM, Maxime Devos wrote: > Guix doesn't do staged installation > (https://www.gnu.org/software/automake/manual/html_node/DESTDIR.html), > so I would avoid (ab)using DESTDIR here. Instead of this phase, > maybe do > [...] > (string-append "PREFIX=" #$output))))))) > instead (untested)? > No idea why I had DESTDIR there (there are some old packages I made, live and learn!) but your suggestion has the same result. Attached is v3 of the patch with just this adjustment. Thanks! John 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. --- gnu/packages/security-token.scm | 64 +++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 79afdcee47..56b1552349 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2021 Sergey Trofimov ;;; Copyright © 2021 Dhruvin Gandhi ;;; Copyright © 2021 Ahmad Jarara +;;; Copyright © 2022 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -53,6 +54,7 @@ (define-module (gnu packages security-token) #:use-module (gnu packages dns) #:use-module (gnu packages gettext) #:use-module (gnu packages graphviz) + #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages gtk) #:use-module (gnu packages libbsd) @@ -72,7 +74,9 @@ (define-module (gnu packages security-token) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-xyz) #:use-module (gnu packages swig) + #:use-module (gnu packages suckless) #:use-module (gnu packages web) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml)) (define-public ccid @@ -443,6 +447,66 @@ (define-public python-pyscard (define-public python2-pyscard (package-with-python2 python-pyscard)) +(define-public yubikey-oath-dmenu + (package + (name "yubikey-oath-dmenu") + (version "0.13.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/emlun/yubikey-oath-dmenu") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1h6dr4l0gzgdg8zn2c39kx9cx1bgvwqxkz3z95qz9r70xfsghgwk")))) + (build-system python-build-system) + (arguments + (list + #:tests? #f ; there are no tests + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ; no configure script + (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")))) + (replace 'install + (lambda _ + (invoke "make" "install" + (string-append "PREFIX=" #$output))))))) + (inputs + (list dmenu + libnotify + python-click + python-yubikey-manager + ;; TODO add wtype, once packaged, for type support for Wayland + wl-clipboard ; optional clipboard support for Wayland + xclip ; optional clipboard support for X11 + xdotool)) ; optional type support for X11 + (home-page + "https://github.com/emlun/yubikey-oath-dmenu/") + (synopsis "Interface for getting OATH codes from a YubiKey using dmenu") + (description + "Yubikey-oath-demenu lets you pick an OATH credential from your YubiKey using +dmenu, and copies the corresponding OTP to the clipboard. Alternatively, it +can \"type\" the OTP using @code{xdotool} on X11. + +Notable features: + +@itemize +@item Pick between all credentials on all connected YubiKeys +@item No mouse interaction required +@end itemize\n") + (license license:gpl3+))) + (define-public libu2f-host (package (name "libu2f-host") -- 2.34.0