From: ericbavier@centurylink.net
To: 33011@debbugs.gnu.org
Cc: Eric Bavier <bavier@cray.com>
Subject: [bug#33011] [PATCH 1/3] gnu: guile2.0-guix: Fix build.
Date: Wed, 10 Oct 2018 20:52:44 -0500 [thread overview]
Message-ID: <20181011015246.24964-2-ericbavier@centurylink.net> (raw)
In-Reply-To: <20181011015246.24964-1-ericbavier@centurylink.net>
From: Eric Bavier <bavier@cray.com>
* 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 © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2015, 2018 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
@@ -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 © 2018 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
+;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
;;;
;;; 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
next prev parent reply other threads:[~2018-10-11 1:54 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-11 1:52 [bug#33009] [PATCH 0/3] Some guile@2.0 patches ericbavier
2018-10-11 1:52 ` ericbavier [this message]
2018-10-14 21:39 ` [bug#33011] [PATCH 1/3] gnu: guile2.0-guix: Fix build Ludovic Courtès
2018-10-16 22:35 ` bug#33011: " Eric Bavier
2018-10-11 1:52 ` [bug#33010] [PATCH 2/3] gnu: Add guix-minimal ericbavier
2018-10-14 21:42 ` Ludovic Courtès
2018-10-15 9:02 ` Efraim Flashner
2018-10-15 15:46 ` Jonathan Brielmaier
2018-10-15 19:26 ` Ludovic Courtès
2018-10-15 14:21 ` Eric Bavier
2018-10-15 19:28 ` Ludovic Courtès
2018-10-15 19:43 ` Eric Bavier
2018-10-16 11:28 ` Ludovic Courtès
2018-10-16 22:33 ` bug#33010: " Eric Bavier
2018-10-11 1:52 ` [bug#33012] [PATCH 3/3] ui: Fix port-buffering with guile@2.0 ericbavier
2018-10-14 21:43 ` Ludovic Courtès
2018-10-16 22:31 ` bug#33012: " Eric Bavier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181011015246.24964-2-ericbavier@centurylink.net \
--to=ericbavier@centurylink.net \
--cc=33011@debbugs.gnu.org \
--cc=bavier@cray.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).