From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44257) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAQAv-0007S5-KZ for guix-patches@gnu.org; Wed, 10 Oct 2018 21:54:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAQAt-0001QV-QO for guix-patches@gnu.org; Wed, 10 Oct 2018 21:54:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:39758) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gAQAt-0001QE-MO for guix-patches@gnu.org; Wed, 10 Oct 2018 21:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gAQAt-0006Ex-KW for guix-patches@gnu.org; Wed, 10 Oct 2018 21:54:03 -0400 Subject: [bug#33011] [PATCH 1/3] gnu: guile2.0-guix: Fix build. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44130) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAQAB-0007PV-MT for guix-patches@gnu.org; Wed, 10 Oct 2018 21:53:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAQAA-0000fz-Lu for guix-patches@gnu.org; Wed, 10 Oct 2018 21:53:19 -0400 Received: from mail.onyx.syn-alias.com ([206.152.134.66]:44951 helo=smtp.centurylink.net) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gAQAA-0000fS-Fc for guix-patches@gnu.org; Wed, 10 Oct 2018 21:53:18 -0400 From: ericbavier@centurylink.net Date: Wed, 10 Oct 2018 20:52:44 -0500 Message-Id: <20181011015246.24964-2-ericbavier@centurylink.net> In-Reply-To: <20181011015246.24964-1-ericbavier@centurylink.net> References: <20181011015246.24964-1-ericbavier@centurylink.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33011@debbugs.gnu.org Cc: Eric Bavier From: Eric Bavier * gnu/packages/gnupg.scm (guile2.0-gcrypt): New variable. * gnu/packages/guile.scm (guile2.0-sqlite3): New variable. * gnu/packages/package-management.scm (guile2.0-guix)[propagated-inputs]: Use them. --- gnu/packages/gnupg.scm | 12 ++++++++++-- gnu/packages/guile.scm | 4 ++++ gnu/packages/package-management.scm | 2 ++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 067a2338d..c38fe6420 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2013, 2015, 2018 Andreas Enge -;;; Copyright =C2=A9 2014 Eric Bavier +;;; Copyright =C2=A9 2014, 2018 Eric Bavier ;;; Copyright =C2=A9 2014, 2015, 2016 Mark H Weaver ;;; Copyright =C2=A9 2015 Paul van der Walt ;;; Copyright =C2=A9 2015, 2016, 2017, 2018 Efraim Flashner @@ -67,7 +67,8 @@ #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) - #:use-module (guix build-system python)) + #:use-module (guix build-system python) + #:use-module (srfi srfi-1)) (define-public libgpg-error (package @@ -485,6 +486,13 @@ strong randomness, and more. It is implemented using the foreign function interface (FFI) of Guile.") (license license:gpl3+))) +(define-public guile2.0-gcrypt + (package (inherit guile-gcrypt) + (name "guile2.0-gcrypt") + (inputs + `(("guile" ,guile-2.0) + ,@(alist-delete "guile" (package-inputs guile-gcrypt)))))) + (define-public python-gpg (package (name "python-gpg") diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index e223edb9f..912b0218e 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -19,6 +19,7 @@ ;;; Copyright =C2=A9 2018 Maxim Cournoyer ;;; Copyright =C2=A9 2018 Arun Isaac ;;; Copyright =C2=A9 2018 Pierre-Antoine Rouby +;;; Copyright =C2=A9 2018 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -1151,6 +1152,9 @@ Guile's foreign function interface.") "This package provides Guile bindings to the SQLite database system.") (license license:gpl3+))) +(define-public guile2.0-sqlite3 + (package-for-guile-2.0 guile-sqlite3)) + (define-public haunt (package (name "haunt") diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 500abd512..000c28632 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -365,7 +365,9 @@ the Nix package manager.") ,@(alist-delete "guile" (package-inputs guix)))) (propagated-inputs `(("gnutls" ,gnutls/guile-2.0) + ("guile-gcrypt" ,guile2.0-gcrypt) ("guile-json" ,guile2.0-json) + ("guile-sqlite3" ,guile2.0-sqlite3) ("guile-ssh" ,guile2.0-ssh) ("guile-git" ,guile2.0-git))))) -- 2.19.0