Received: (at 70703) by debbugs.gnu.org; 1 May 2024 20:29:35 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 01 16:29:35 2024
Received: from localhost ([127.0.0.1]:39263 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1s2Ga6-00066E-PE
for submit <at> debbugs.gnu.org; Wed, 01 May 2024 16:29:35 -0400
Received: from mail-40134.protonmail.ch ([185.70.40.134]:18569)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <john.kehayias@HIDDEN>) id 1s2Ga4-00065w-Rl
for 70703 <at> debbugs.gnu.org; Wed, 01 May 2024 16:29:33 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com;
s=protonmail3; t=1714595345; x=1714854545;
bh=b7gLxMgT3iBZ6OyiDdv2z3ZXlAnWbfJusPvhCUNxTCA=;
h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References:
Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID:
Message-ID:BIMI-Selector;
b=Vu1ojXCUquHmaRc0IGt0b+f2/dRM86+v+cRhDSKuZSOVxTXdX1txCDK6axxTEMZhz
pFWcte2FYoKUiboe32CeB6WsGZkrdaYTmXIyx/LObPmB1ziOrDk3ppQr4TvgfQ7mhk
ow+zV7xL7yMlhw6t+pBY6SRLwRfb5cquP5P+Cu1cleK4eYEQOUhs/Wl8BYjI/X3phR
UNvsRxZEYUxcGg0E+A/Kgnf2yfB0Zf4Z807bctfCszsnQ8tHofMoYPNfuO0jMuH17H
/uyhz8g8i6SS2AEtZ5TJlBs9MjZ7aadP9m2ciQe8R1Y6M/WjwTnQVD08k9wZd4xI3L
TB0JKY0J3fe5w==
Date: Wed, 01 May 2024 20:29:00 +0000
To: 70703 <at> debbugs.gnu.org
From: John Kehayias <john.kehayias@HIDDEN>
Subject: [PATCH 2/2] gnu: Add rofi-pass-wayland.
Message-ID: <002c0ca60424a755617fc59aeb8a7a9214b369b6.1714594998.git.john.kehayias@HIDDEN>
In-Reply-To: <cover.1714594998.git.john.kehayias@HIDDEN>
References: <cover.1714594998.git.john.kehayias@HIDDEN>
Feedback-ID: 7805494:user:proton
X-Pm-Message-ID: 7c6f3cf6d99a5f860394dda2e71c89b3ec67fed4
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 70703
Cc: John Kehayias <john.kehayias@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
This variant of rofi-pass swaps out the X-related tools used for Wayland
versions and changes the default configuration file to use them.
* gnu/packages/password-utils.scm (rofi-pass-wayland): New variable.
Change-Id: Ie844fc2f3a7f49fd6322e5418a6944b6b941abce
---
gnu/packages/password-utils.scm | 47 +++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.=
scm
index 96243a60ea..50d098ca5f 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -976,6 +976,53 @@ (define-public rofi-pass
@end enumerate")
(license license:gpl3))))
+(define-public rofi-pass-wayland
+ (package
+ (inherit rofi-pass)
+ (name "rofi-pass-wayland")
+ (arguments
+ (substitute-keyword-arguments (package-arguments rofi-pass)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ ;; Set the clipboard and backend tools to ones for Wayland in =
the
+ ;; default configuration file.
+ (add-after 'fix-etc-path 'set-wayland-defaults
+ (lambda _
+ (substitute* "config.example"
+ ;; Note the typo in current configuration.
+ (("#clibpoard_backend=3Dxclip")
+ "clipboard_backend=3Dwl-clipboard")
+ (("#backend=3Dxdotool")
+ "backend=3Dwtype"))
+ (substitute* "rofi-pass"
+ (("/etc")
+ (string-append #$output "/etc")))))
+ ;; Use Wayland related tools instead.
+ (replace 'wrap-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((bin (string-append #$output "/bin")))
+ (for-each
+ (lambda (script)
+ (wrap-program (string-append bin "/" script)
+ (list "PATH" 'prefix
+ (map
+ (lambda (binary)
+ (dirname (search-input-file
+ inputs
+ (string-append "bin/" binary))))
+ ;; wl-copy for wl-clipboard.
+ '("pass" "pwgen" "rofi" "wl-copy" "wtype")))=
))
+ (list "addpass" "rofi-pass")))))))))
+ (inputs
+ (modify-inputs (package-inputs rofi-pass)
+ (replace "rofi" rofi-wayland)
+ (replace "xclip" wl-clipboard)
+ (replace "xdotool" wtype)
+ (delete "xset")))
+ (description (string-append
+ (package-description rofi-pass)
+ "\nThis package provides Wayland support by default.")))=
)
+
(define-public tessen
(package
(name "tessen")
--
2.41.0
guix-patches@HIDDEN:bug#70703; Package guix-patches.
Full text available.
Received: (at 70703) by debbugs.gnu.org; 1 May 2024 20:29:33 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 01 16:29:33 2024
Received: from localhost ([127.0.0.1]:39261 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1s2Ga5-000662-2a
for submit <at> debbugs.gnu.org; Wed, 01 May 2024 16:29:33 -0400
Received: from mail-4322.protonmail.ch ([185.70.43.22]:28181)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <john.kehayias@HIDDEN>) id 1s2Ga2-00065v-5y
for 70703 <at> debbugs.gnu.org; Wed, 01 May 2024 16:29:31 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com;
s=protonmail3; t=1714595342; x=1714854542;
bh=Prua2Dr5f6LCoGafwFembuLwvR2fJziXz6JWrZyoq0g=;
h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References:
Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID:
Message-ID:BIMI-Selector;
b=ibQs2HQhuXCYCqCng3xIU3QdbKkJiIvjsMP5MOjsOSMad43dez3pCQtHdOzFxm0vL
5piAjhB51suOW42RKQTsp1lZ7RXfbmFgx0JNsdIR9IDt5eH2cJgzjY2d2RoWc5JtU8
YTpn83OaFthfBM6LI1AVbEF1PLPRYE+y/V/t/9PHv9NuACYIQ6G3C39uF52LSZRgHT
sWGnXQOzBp1HOlNVtwAU899bXAZ7W0EhsGZTie8fFWL0STYVkoXzulch/PIUXP3H40
ZChXG8sLsbDgYwnBW2BT84oPigKiE9zlcxTYrUHna91+tE76JGU5ITJAcqxm2lNBm0
t6bqEtMEm5dNg==
Date: Wed, 01 May 2024 20:28:52 +0000
To: 70703 <at> debbugs.gnu.org
From: John Kehayias <john.kehayias@HIDDEN>
Subject: [PATCH 1/2] gnu: rofi-pass: Update to 2.0.2-0.8aa6b92.
Message-ID: <aa94bdf9811c4bfbdbf0c0cf812bdd9f842528a0.1714594998.git.john.kehayias@HIDDEN>
In-Reply-To: <cover.1714594998.git.john.kehayias@HIDDEN>
References: <cover.1714594998.git.john.kehayias@HIDDEN>
Feedback-ID: 7805494:user:proton
X-Pm-Message-ID: 918b9404d83752d1893b2ef8d4aa827af93cf781
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: 0.7 (/)
X-Debbugs-Envelope-To: 70703
Cc: John Kehayias <john.kehayias@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.3 (/)
With no release in over 5 years, update to the most recent commit to includ=
e
features like Wayland support. Rewrite the package definition to use the
makefile, patch paths, and generally improve the style.
* gnu/packages/password-utils.scm (rofi-pass): Update to 2.0.2-0.8aa6b92.
[origin]: Use git-fetch rather than just the individual script.
[build-system]: Switch to gnu-build-system.
[arguments]: Remove modules and builder. Disable tests. Add make-flags.
<phases>: Add fix-etc-path and wrap-path phases. Remove configure and buil=
d.
[propagated-inputs]: Remove all, adding ...
[inputs]: ... here. Add bash-minimal, pwgen, xclip, and xset.
Change-Id: Ia03ef46f3b567bc2eb6d1350db3612043f06d94b
---
gnu/packages/password-utils.scm | 90 ++++++++++++++++++++++-----------
1 file changed, 60 insertions(+), 30 deletions(-)
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.=
scm
index eb64a7f306..96243a60ea 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -40,6 +40,7 @@
;;; Copyright =C2=A9 2022 Nicolas Graves <ngraves@HIDDEN>
;;; Copyright =C2=A9 2022 Petr Hodina <phodina@HIDDEN>
;;; Copyright =C2=A9 2023 Christian Miller <christian.miller@HIDDEN>
+;;; Copyright =C2=A9 2024 John Kehayias <john.kehayias@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -906,35 +907,64 @@ (define-public qtpass
(license license:gpl3+)))
(define-public rofi-pass
- (package
- (name "rofi-pass")
- (version "2.0.2")
- (source
- (origin
- (method url-fetch)
- (uri
- (string-append "https://raw.githubusercontent.com/carnager/rofi-pa=
ss/"
- version "/rofi-pass"))
- (sha256
- (base32 "0msldkndqp40nx1s5s7ggcr97ir4nshpmnyzvj5hqw1l7m3gvw6j"))
- (file-name name)))
- (build-system trivial-build-system)
- (arguments
- `(#:modules ((guix build utils))
- #:builder
- (begin
- (use-modules (guix build utils))
- (let ((source (string-append (assoc-ref %build-inputs "source")))
- (script "rofi-pass")
- (out (assoc-ref %outputs "out")))
- (copy-file source script)
- (chmod script #o555)
- (install-file script (string-append out "/bin"))))))
- (propagated-inputs
- (list password-store rofi xdotool))
- (home-page "https://github.com/carnager/rofi-pass")
- (synopsis "Rofi frontend for password-store")
- (description "Rofi-pass provides a way to manipulate information store=
d
+ ;; No release in over 5 years with recent commits adding features like
+ ;; Wayland support.
+ (let ((commit "8aa6b9293a8f0af267425326fa966966ca42085e")
+ (revision "0"))
+ (package
+ (name "rofi-pass")
+ (version (git-version "2.0.2" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/carnager/rofi-pass")
+ (commit commit)))
+ (sha256
+ (base32
+ "0axz4ijp6fay6f2yn1cg6223l89jkg8wnxslbk1g5jpli0njxw43"))
+ (file-name (git-file-name name version))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:tests? #f ; no tests
+ #:make-flags #~(list (string-append "PREFIX=3D" #$output))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-etc-path
+ (lambda _
+ (substitute* "Makefile"
+ (("\\$\\(DESTDIR\\)/etc")
+ (string-append #$output "/etc")))
+ (substitute* "rofi-pass"
+ (("/etc")
+ (string-append #$output "/etc")))))
+ (delete 'configure) ; no configure
+ (delete 'build) ; no build
+ (add-after 'install 'wrap-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((bin (string-append #$output "/bin")))
+ (for-each
+ (lambda (script)
+ (wrap-program (string-append bin "/" script)
+ (list "PATH" 'prefix
+ (map
+ (lambda (binary)
+ (dirname (search-input-file
+ inputs
+ (string-append "bin/" binar=
y))))
+ '("pass" "pwgen" "rofi"
+ "xclip" "xdotool" "xset")))))
+ (list "addpass" "rofi-pass"))))))))
+ (inputs (list bash-minimal ;for wrap-program
+ password-store
+ pwgen
+ rofi
+ xclip
+ xdotool
+ xset))
+ (home-page "https://github.com/carnager/rofi-pass")
+ (synopsis "Rofi frontend for password-store")
+ (description "Rofi-pass provides a way to manipulate information sto=
red
using password-store through rofi interface:
@enumerate
@item open URLs of entries with hotkey;
@@ -944,7 +974,7 @@ (define-public rofi-pass
@item auto-typing of more than one field, using the autotype entry;
@item bookmarks mode (open stored URLs in browser, default: Alt+x).
@end enumerate")
- (license license:gpl3)))
+ (license license:gpl3))))
(define-public tessen
(package
--
2.41.0
guix-patches@HIDDEN:bug#70703; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 1 May 2024 20:27:15 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 01 16:27:15 2024 Received: from localhost ([127.0.0.1]:39244 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1s2GXr-00064e-IG for submit <at> debbugs.gnu.org; Wed, 01 May 2024 16:27:15 -0400 Received: from lists.gnu.org ([2001:470:142::17]:41992) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <john.kehayias@HIDDEN>) id 1s2GXp-00064Y-Ea for submit <at> debbugs.gnu.org; Wed, 01 May 2024 16:27:14 -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 <john.kehayias@HIDDEN>) id 1s2GXM-0005pE-NY for guix-patches@HIDDEN; Wed, 01 May 2024 16:26:44 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <john.kehayias@HIDDEN>) id 1s2GXK-0006Ii-LF for guix-patches@HIDDEN; Wed, 01 May 2024 16:26:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1714595198; x=1714854398; bh=HuwDx8sbkwUSOgp2pX5gCvDJfw/8RLWNk+PfNcaGIlU=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=tXECXVcQCJSy4sIKqbQChKZWD0fA1pKdgXiaI+asijBhzEiPb1Vdm2T+jQnqau6cO 2edN6Y7aS4xZHfZGUvUIqBbqcKTG8nL9mtQM0nteMXNXkhIdW9T3CTd6QqVLsl+p+Z uxn+mucmD/UpL6z/MV5iJJwKkjmIMlZfYYGSq+6q1tJbM6YZHSl7Ztuwqphh8TvPkI JugGr+AhnLmgh6iofRV4b5ojNMN7qC/Swq+OUoP2exgzPuykxAfn9rYSqQ4hNYzFHQ /gS33aTcmmoMJknMxCcvF693l7krlx7jaaZyC5gnvL5zBcLHmstuFmV6yWSHjQcrPf cC/Yc7PJnUOaw== Date: Wed, 01 May 2024 20:26:33 +0000 To: guix-patches@HIDDEN From: John Kehayias <john.kehayias@HIDDEN> Subject: [PATCH 0/2] Update rofi-pass; add rofi-pass-wayland Message-ID: <cover.1714594998.git.john.kehayias@HIDDEN> Feedback-ID: 7805494:user:proton X-Pm-Message-ID: 4c02e15afb1eb8d2d7e99965c4cd5937f5c97828 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=185.70.43.22; envelope-from=john.kehayias@HIDDEN; helo=mail-4322.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit Cc: John Kehayias <john.kehayias@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -0.0 (/) Hello, In recently moving to Wayland, I found rofi-pass doesn't support Wayland. W= ell at least our version. There has been no release in over 5 years, but recent commits (and seems from a Guix contributor) add Wayland support. So, two patches: 1. update rof-pass to the current commit. Rewrite the package definition to include all the needed tools, config file, extra script, and improve the style. 2. add rofi-pass-wayland. This replaces the X tools with Wayland ones in th= e inputs and phases, and modifies the default configuration file to use them. I've been using this one locally and it works well on Wayland. Thanks! John John Kehayias (2): gnu: rofi-pass: Update to 2.0.2-0.8aa6b92. gnu: Add rofi-pass-wayland. gnu/packages/password-utils.scm | 137 +++++++++++++++++++++++++------- 1 file changed, 107 insertions(+), 30 deletions(-) base-commit: 2aeb9faa421635c0531d96658414e5bf288a3142 -- 2.41.0
John Kehayias <john.kehayias@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#70703; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.