GNU bug report logs - #33011
[PATCH 1/3] gnu: guile2.0-guix: Fix build.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Eric Bavier <ericbavier <at> centurylink.net>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#33011: closed ([PATCH 1/3] gnu: guile2.0-guix: Fix build.)
Date: Tue, 16 Oct 2018 22:36:02 +0000

[Message part 1 (text/plain, inline)]

Your message dated Tue, 16 Oct 2018 17:35:02 -0500
with message-id <20181016173502.3870e904 <at> centurylink.net>
and subject line Re: [bug#33011] [PATCH 1/3] gnu: guile2.0-guix: Fix build.
has caused the debbugs.gnu.org bug report #33011,
regarding [PATCH 1/3] gnu: guile2.0-guix: Fix build.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
33011: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=33011
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: ericbavier <at> centurylink.net
To: guix-patches <at> gnu.org
Cc: Eric Bavier <bavier <at> cray.com>
Subject: [PATCH 1/3] gnu: guile2.0-guix: Fix build.
Date: Wed, 10 Oct 2018 20:52:44 -0500

From: Eric Bavier <bavier <at> 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 <at> gnu.org>
 ;;; Copyright © 2013, 2015, 2018 Andreas Enge <andreas <at> enge.fr>
-;;; Copyright © 2014 Eric Bavier <bavier <at> member.fsf.org>
+;;; Copyright © 2014, 2018 Eric Bavier <bavier <at> member.fsf.org>
 ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw <at> netris.org>
 ;;; Copyright © 2015 Paul van der Walt <paul <at> denknerd.org>
 ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim <at> 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 <at> gmail.com>
 ;;; Copyright © 2018 Arun Isaac <arunisaac <at> systemreboot.net>
 ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby <at> inria.fr>
+;;; Copyright © 2018 Eric Bavier <bavier <at> 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

[Message part 3 (message/rfc822, inline)]

From: Eric Bavier <ericbavier <at> centurylink.net>
Cc: 33011-done <at> debbugs.gnu.org
Subject: Re: [bug#33011] [PATCH 1/3] gnu: guile2.0-guix: Fix build.
Date: Tue, 16 Oct 2018 17:35:02 -0500

[Message part 4 (text/plain, inline)]

On Sun, 14 Oct 2018 23:39:30 +0200
ludo <at> gnu.org (Ludovic Courtès) wrote:

> Hello Eric,
> 
> ericbavier <at> centurylink.net skribis:
> 
> > From: Eric Bavier <bavier <at> 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.  
> 
> LGTM, thanks!
> 
> As discussed on IRC, I still plan to remove support for Guile 2.0
> soonish, but in the meantime I think this patch doesn’t hurt.

OK.

Pushed in c8e3651a824bbc28915802265d9a5e7cc6405eea

[Message part 5 (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.