From patchwork Wed Jul 10 14:29:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Amar M. Singh" X-Patchwork-Id: 14555 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 5E921171AC; Wed, 10 Jul 2019 15:30:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 02B351718A for ; Wed, 10 Jul 2019 15:30:09 +0100 (BST) Received: from localhost ([::1]:34016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlDbk-00078H-Fv for patchwork@mira.cbaines.net; Wed, 10 Jul 2019 10:30:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49152) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlDbg-000781-C6 for guix-patches@gnu.org; Wed, 10 Jul 2019 10:30:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlDbf-0005AR-1p for guix-patches@gnu.org; Wed, 10 Jul 2019 10:30:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55767) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlDbe-00059P-T1 for guix-patches@gnu.org; Wed, 10 Jul 2019 10:30:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hlDbe-0007b6-Nk for guix-patches@gnu.org; Wed, 10 Jul 2019 10:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36576] [PATCH] gnu: shroud: Update to 0.1.2 Resent-From: Amar Singh Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jul 2019 14:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 36576 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36576@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.156276896929141 (code B ref -1); Wed, 10 Jul 2019 14:30:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 Jul 2019 14:29:29 +0000 Received: from localhost ([127.0.0.1]:36355 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlDb7-0007Zx-8B for submit@debbugs.gnu.org; Wed, 10 Jul 2019 10:29:29 -0400 Received: from lists.gnu.org ([209.51.188.17]:45181) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hlDb4-0007Zo-Iy for submit@debbugs.gnu.org; Wed, 10 Jul 2019 10:29:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48465) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlDb3-000728-0W for guix-patches@gnu.org; Wed, 10 Jul 2019 10:29:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlDb1-0004DM-OC for guix-patches@gnu.org; Wed, 10 Jul 2019 10:29:24 -0400 Received: from knopi.disroot.org ([178.21.23.139]:32838) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hlDb1-0004AN-2w for guix-patches@gnu.org; Wed, 10 Jul 2019 10:29:23 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id B65383652E for ; Wed, 10 Jul 2019 16:29:20 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zZWqbEEKK7gc for ; Wed, 10 Jul 2019 16:29:19 +0200 (CEST) From: Amar Singh DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1562768959; bh=2NeiMQQgPQwpommNUfnltAmU1JlhBRuPbPdfZFWKrZg=; h=From:To:Subject:Date; b=T88ZSbxlyqO8/M4NtswjeLiSA0YNCJ1AUC6/kr+NQCmZ+xp0COpXF2DBI3V01elc7 3cfz+OED5Oc775Inq00X1zUrLWuCg26pXrvcbJoTsb/p9swwgwUu+S4+5bG+t1p5o3 IMCCPkyko46kXrwLtrjVgtEYZoT2TC/gKC+9Ah7RmFp0mXvp/EzQCHupleR9fQ+j/l EH22Qi4DN+P3QN+BGQbFEAu1I42RWsxJq/EhP2YEtiJqk1JTqP6ZLt9Idd+D5M7DYU GjnFv/zZH096gOgktLq7lW8OmnjQfDChvzJx+BHz397pExYxwn1YErjwNlT2Zkz/F2 ms/uzI+oRuEAw== Date: Wed, 10 Jul 2019 19:59:06 +0530 Message-ID: <85sgrenetp.fsf@disroot.org> Mime-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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 Shroud now builds with Guile-2.2. From 21bb1505f663084584ab5d61f32a6b168f64f3ca Mon Sep 17 00:00:00 2001 From: Amar Singh Date: Wed, 10 Jul 2019 19:57:29 +0530 Subject: [PATCH] gnu: shroud: Update to 0.1.2. * gnu/packages/password-utils.scm (shroud): Update to 0.1.2. Shroud now builds with Guile-2.2. --- gnu/packages/password-utils.scm | 42 +++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 49024b26c4..5c3cff64c9 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -50,6 +50,7 @@ #:use-module (gnu packages admin) #:use-module (gnu packages aidc) #:use-module (gnu packages authentication) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -236,28 +237,49 @@ platforms.") (define-public shroud (package (name "shroud") - (version "0.1.1") + (version "0.1.2") (source (origin (method url-fetch) - (uri (string-append "https://files.dthompson.us/shroud/shroud-" - version ".tar.gz")) + (uri (string-append "https://files.dthompson.us/" + name "/shroud-" version ".tar.gz")) (sha256 (base32 - "1y43yhgy2zbrk5bqj3qyx9rkcz2bma9sinlrg7dip3jqms9gq4lr")))) + "1l2shrhvcwfzkar9qiwb75nhcqmx25iz55lzmz0c187nbjhqzi9p")))) (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config) + ("autoconf" ,autoconf-wrapper) + ("automake" ,automake) + ("gettext" ,gettext-minimal))) (arguments - '(#:phases + `(#:modules ((guix build gnu-build-system) + (guix build utils) + (ice-9 popen) + (ice-9 rdelim) + (srfi srfi-26)) + #:phases (modify-phases %standard-phases (add-after 'install 'wrap-shroud - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (ccachedir (string-append out "/lib/guile/2.0/ccache")) - (prog (string-append out "/bin/shroud"))) + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (guile (assoc-ref inputs "guile")) + (xclip (assoc-ref inputs "xclip")) + (prog (string-append out "/bin/shroud")) + (deps (list xclip)) + (effective (read-line + (open-pipe* OPEN_READ + (string-append guile "/bin/guile") + "-c" "(display (effective-version))"))) + (path (map (cut string-append <> "/bin") + (delete #f deps))) + (ccachedir (string-append out + "/lib/guile/" effective "/site-ccache"))) (wrap-program prog + `("PATH" ":" prefix ,path) `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,ccachedir))) #t)))))) (inputs - `(("guile" ,guile-2.0) + `(("guile" ,guile-2.2) ("gnupg" ,gnupg) ("xclip" ,xclip))) (synopsis "GnuPG-based secret manager") -- 2.22.0