From patchwork Sat Apr 29 21:28:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 49691 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 1CAEB27BBE2; Sat, 29 Apr 2023 22:29:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 08BF727BBEA for ; Sat, 29 Apr 2023 22:29:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pss7r-0006Lu-G1; Sat, 29 Apr 2023 17:29:03 -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 1pss7q-0006KS-OS for guix-patches@gnu.org; Sat, 29 Apr 2023 17:29:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pss7q-0000yG-GE for guix-patches@gnu.org; Sat, 29 Apr 2023 17:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pss7q-00077s-7x for guix-patches@gnu.org; Sat, 29 Apr 2023 17:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63179] [PATCH 1/2] gnu: browserpass-native: Update to 3.1.0. References: <20230429212602.8032-1-timotej.lazar@araneo.si> In-Reply-To: <20230429212602.8032-1-timotej.lazar@araneo.si> Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 29 Apr 2023 21:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63179 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63179@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 63179-submit@debbugs.gnu.org id=B63179.168280370927339 (code B ref 63179); Sat, 29 Apr 2023 21:29:02 +0000 Received: (at 63179) by debbugs.gnu.org; 29 Apr 2023 21:28:29 +0000 Received: from localhost ([127.0.0.1]:36739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pss7I-00076s-Ni for submit@debbugs.gnu.org; Sat, 29 Apr 2023 17:28:29 -0400 Received: from araneo.si ([90.157.193.204]:46056) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pss7G-00076f-1N for 63179@debbugs.gnu.org; Sat, 29 Apr 2023 17:28:27 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 048a4d9a for <63179@debbugs.gnu.org>; Sat, 29 Apr 2023 21:28:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; s=20180623; bh=oovrWcqU4jPDhP0PgBR+TGwFtoU=; b=Bs/PP/Jjr9rfBfSk P4Mx+m62jR2xq65CkbWdWJBonotOrigGNqsmTlY//6OX9go56zX6XRdsmsHRZxf3 k4zi2msi6W/NFD6uQoE7avoeA/R2HO/SqBGGOvrqYEavfOce9GSzav8gonxBaAAG hYtZo3M5Sb2xmHaCT80rIdbhzcd3gwhOhZ26pFdG2TImK7lQyPJ84ln5qnNWmkID okE9OavhOcxJXBDRfWuxpkddCaNyOoRLHK0YGmHZNoGbBObejuDpIhRze75VcgNz O7hy4RPdHL54835bC0Tv8FTA0diGGyqudaQTXDHDJOTfBUH/7l7vg8G+kgPKdbDG sJmu5g== Received: by araneo.si (OpenSMTPD) with ESMTPSA id fe8b44ed (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 29 Apr 2023 21:28:25 +0000 (UTC) From: Timotej Lazar Date: Sat, 29 Apr 2023 23:28:10 +0200 Message-Id: <20230429212811.14469-1-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.39.2 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 (browserpass-native): Update to 3.1.0. [inputs]: Add bash-minimal. --- gnu/packages/password-utils.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index f5f301308a..17427bc07c 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -75,6 +75,7 @@ (define-module (gnu packages password-utils) #:use-module (gnu packages authentication) #:use-module (gnu packages autotools) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) @@ -898,7 +899,7 @@ (define-public tessen (define-public browserpass-native (package (name "browserpass-native") - (version "3.0.7") + (version "3.1.0") (source (origin (method git-fetch) @@ -907,8 +908,7 @@ (define-public browserpass-native (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "1jkjslbbac49xjyjkc2b07phdm3i64z40kh6h55cl22dxjmpp1nb")))) + (base32 "1if72k526sqqxnw250qwxvzwvh1w0k8ag4p4xq3442b22hywx72i")))) (build-system go-build-system) (arguments `(#:import-path "github.com/browserpass/browserpass-native" @@ -954,7 +954,7 @@ (define-public browserpass-native (native-inputs (list which)) (inputs - (list gnupg go-github-com-mattn-go-zglob + (list bash-minimal gnupg go-github-com-mattn-go-zglob go-github-com-rifflock-lfshook go-github-com-sirupsen-logrus go-golang-org-x-sys)) (home-page "https://github.com/browserpass/browserpass-native") From patchwork Sat Apr 29 21:28:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 49690 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 D441927BBEC; Sat, 29 Apr 2023 22:29:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 786C027BBE9 for ; Sat, 29 Apr 2023 22:29:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pss7t-0006NL-EF; Sat, 29 Apr 2023 17:29:05 -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 1pss7r-0006Lp-MI for guix-patches@gnu.org; Sat, 29 Apr 2023 17:29:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pss7q-0000yS-Sg for guix-patches@gnu.org; Sat, 29 Apr 2023 17:29:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pss7q-000780-OW for guix-patches@gnu.org; Sat, 29 Apr 2023 17:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63179] [PATCH 2/2] gnu: browserpass-native: Use new package style. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 29 Apr 2023 21:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63179 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63179@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 63179-submit@debbugs.gnu.org id=B63179.168280371327356 (code B ref 63179); Sat, 29 Apr 2023 21:29:02 +0000 Received: (at 63179) by debbugs.gnu.org; 29 Apr 2023 21:28:33 +0000 Received: from localhost ([127.0.0.1]:36743 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pss7N-000779-2K for submit@debbugs.gnu.org; Sat, 29 Apr 2023 17:28:33 -0400 Received: from araneo.si ([90.157.193.204]:46056) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pss7J-00076f-Hg for 63179@debbugs.gnu.org; Sat, 29 Apr 2023 17:28:30 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 31940416 for <63179@debbugs.gnu.org>; Sat, 29 Apr 2023 21:28:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20180623; bh=OJmjVW4J6SvzMC/QBDgWV T1cpDE=; b=yLr8L6vdzAf1GIRXQGWHukaPNLa2E8B3Xw7Ndi1bOrwatRVMVXwuH I1fS2VTIACVzaREor9rqfyvG3FKaDZIN0nf+VsCsusvaON6knKtvhLNLAqFm+MSM oGvozyS4f/WgFhhRA2+a1aLeB+s5Llk0+3He/UbRAUkqJE8EunWgZ1RrrXeJkAXH Fd4I7+Ten+x1xgrc2wsB+uj/071Vv8FOgwrzb0bk/QazpobKHJntfmig92pISbLb CcZQAcuAv5+cqar9N7NFaorMXjLCcuMYbs/HHxg60sCL1LNUivi9RcL3MHCtzgkx nwAyPo9N26fq/G2KloHpgvjQoivlfOo+g== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 5abf7bb9 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sat, 29 Apr 2023 21:28:27 +0000 (UTC) From: Timotej Lazar Date: Sat, 29 Apr 2023 23:28:11 +0200 Message-Id: <20230429212811.14469-2-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230429212811.14469-1-timotej.lazar@araneo.si> References: <20230429212811.14469-1-timotej.lazar@araneo.si> 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 (browserpass-native)[arguments]: Use gexps. Drop trailing #t from phases. --- gnu/packages/password-utils.scm | 71 ++++++++++++++------------------- 1 file changed, 31 insertions(+), 40 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 17427bc07c..0a3f2551c9 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -911,46 +911,37 @@ (define-public browserpass-native (base32 "1if72k526sqqxnw250qwxvzwvh1w0k8ag4p4xq3442b22hywx72i")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/browserpass/browserpass-native" - #:install-source? #f - #:phases - (modify-phases %standard-phases - (add-before 'build 'patch-makefile - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - ;; This doesn't go in #:make-flags because the Makefile itself - ;; gets installed. - (substitute* - "src/github.com/browserpass/browserpass-native/Makefile" - (("PREFIX \\?= /usr") - (string-append "PREFIX ?= " out))) - #t))) - (add-before 'build 'configure - (lambda _ - (with-directory-excursion - "src/github.com/browserpass/browserpass-native" - (invoke "make" "configure")) - #t)) - (replace 'build - (lambda _ - (with-directory-excursion - "src/github.com/browserpass/browserpass-native" - (invoke "make")) - #t)) - (replace 'install - (lambda _ - (with-directory-excursion - "src/github.com/browserpass/browserpass-native" - (invoke "make" "install")) - #t)) - (add-after 'install 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gnupg (assoc-ref inputs "gnupg"))) - (wrap-program (string-append out "/bin/browserpass") - `("PATH" ":" prefix - (,(string-append gnupg "/bin")))) - #t)))))) + (list #:import-path "github.com/browserpass/browserpass-native" + #:install-source? #f + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'patch-makefile + (lambda _ + ;; This doesn't go in #:make-flags because the Makefile + ;; itself gets installed. + (substitute* "src/github.com/browserpass/browserpass-native/Makefile" + (("PREFIX \\?= /usr") + (string-append "PREFIX ?= " #$output))))) + (add-before 'build 'configure + (lambda _ + (with-directory-excursion + "src/github.com/browserpass/browserpass-native" + (invoke "make" "configure")))) + (replace 'build + (lambda _ + (with-directory-excursion + "src/github.com/browserpass/browserpass-native" + (invoke "make")))) + (replace 'install + (lambda _ + (with-directory-excursion + "src/github.com/browserpass/browserpass-native" + (invoke "make" "install")))) + (add-after 'install 'wrap-executable + (lambda _ + (wrap-program (string-append #$output "/bin/browserpass") + `("PATH" ":" prefix + (,(string-append #$(this-package-input "gnupg") "/bin"))))))))) (native-inputs (list which)) (inputs