diff options
| author | Eric Bavier <bavier@cray.com> | 2018-10-10 13:26:54 -0500 |
|---|---|---|
| committer | Eric Bavier <bavier@member.fsf.org> | 2018-10-16 17:09:15 -0500 |
| commit | c8e3651a824bbc28915802265d9a5e7cc6405eea (patch) | |
| tree | 829c09f1b22617ca5d149c1cdec177d3c05394d5 | |
| parent | ad0082afe041af1a6e8e8f04415fdcae23e8fc0f (diff) | |
| download | guix-c8e3651a824bbc28915802265d9a5e7cc6405eea.tar guix-c8e3651a824bbc28915802265d9a5e7cc6405eea.tar.gz | |
gnu: guile2.0-guix: Fix build.
* 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.
| -rw-r--r-- | gnu/packages/gnupg.scm | 12 | ||||
| -rw-r--r-- | gnu/packages/guile.scm | 4 | ||||
| -rw-r--r-- | 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 067a2338d4..c38fe64200 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 e223edb9fc..912b0218ef 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 fbbb4c3811..f06a39ddd6 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -367,7 +367,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))))) |