build: Require Guile-SQLite3.
The next commits make (sqlite3) an indirect dependency of (gnu build install), which is itself used by (guix scripts system), hence this new requirement. * configure.ac: Error out when $guix_cv_have_recent_guile_sqlite3 is false. Remove HAVE_GUILE_SQLITE3 Automake conditional. * Makefile.am (MODULES, SCM_TESTS): Remove HAVE_GUILE_SQLITE3 conditions. * doc/guix.texi (Requirements): Add Guile-SQLite3. * README: Ditto. * gnu/packages/package-management.scm (guix)[propagated-inputs]: Add GUILE-SQLITE3. [arguments]: In 'wrap-program' phase, take guile-sqlite3 into account.
This commit is contained in:
parent
6892f0a247
commit
c5a2e1ffcb
16
Makefile.am
16
Makefile.am
|
@ -262,11 +262,7 @@ STORE_MODULES = \
|
||||||
guix/store/database.scm \
|
guix/store/database.scm \
|
||||||
guix/store/deduplication.scm
|
guix/store/deduplication.scm
|
||||||
|
|
||||||
if HAVE_GUILE_SQLITE3
|
|
||||||
MODULES += $(STORE_MODULES)
|
MODULES += $(STORE_MODULES)
|
||||||
else
|
|
||||||
MODULES_NOT_COMPILED += $(STORE_MODULES)
|
|
||||||
endif !HAVE_GUILE_SQLITE3
|
|
||||||
|
|
||||||
# Internal modules with test suite support.
|
# Internal modules with test suite support.
|
||||||
dist_noinst_DATA = guix/tests.scm guix/tests/http.scm
|
dist_noinst_DATA = guix/tests.scm guix/tests/http.scm
|
||||||
|
@ -379,7 +375,9 @@ SCM_TESTS = \
|
||||||
tests/scripts-build.scm \
|
tests/scripts-build.scm \
|
||||||
tests/containers.scm \
|
tests/containers.scm \
|
||||||
tests/pack.scm \
|
tests/pack.scm \
|
||||||
tests/import-utils.scm
|
tests/import-utils.scm \
|
||||||
|
tests/store-database.scm \
|
||||||
|
tests/store-deduplication.scm
|
||||||
|
|
||||||
if HAVE_GUILE_JSON
|
if HAVE_GUILE_JSON
|
||||||
|
|
||||||
|
@ -391,14 +389,6 @@ SCM_TESTS += \
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if HAVE_GUILE_SQLITE3
|
|
||||||
|
|
||||||
SCM_TESTS += \
|
|
||||||
tests/store-database.scm \
|
|
||||||
tests/store-deduplication.scm
|
|
||||||
|
|
||||||
endif
|
|
||||||
|
|
||||||
SH_TESTS = \
|
SH_TESTS = \
|
||||||
tests/guix-build.sh \
|
tests/guix-build.sh \
|
||||||
tests/guix-download.sh \
|
tests/guix-download.sh \
|
||||||
|
|
3
README
3
README
|
@ -23,7 +23,8 @@ GNU Guix currently depends on the following packages:
|
||||||
- [[https://gnu.org/software/guile/][GNU Guile 2.2.x or 2.0.x]], version 2.0.13 or later
|
- [[https://gnu.org/software/guile/][GNU Guile 2.2.x or 2.0.x]], version 2.0.13 or later
|
||||||
- [[https://gnupg.org/][GNU libgcrypt]]
|
- [[https://gnupg.org/][GNU libgcrypt]]
|
||||||
- [[https://www.gnu.org/software/make/][GNU Make]]
|
- [[https://www.gnu.org/software/make/][GNU Make]]
|
||||||
- [[https://www.gnutls.org][GnuTLS]] compiled with guile support enabled.
|
- [[https://www.gnutls.org][GnuTLS]] compiled with guile support enabled
|
||||||
|
- [[https://notabug.org/civodul/guile-sqlite3][Guile-SQLite3]]
|
||||||
- [[https://gitlab.com/guile-git/guile-git][Guile-Git]]
|
- [[https://gitlab.com/guile-git/guile-git][Guile-Git]]
|
||||||
- [[http://www.zlib.net/][zlib]]
|
- [[http://www.zlib.net/][zlib]]
|
||||||
- optionally [[https://savannah.nongnu.org/projects/guile-json/][Guile-JSON]], for the 'guix import pypi' command
|
- optionally [[https://savannah.nongnu.org/projects/guile-json/][Guile-JSON]], for the 'guix import pypi' command
|
||||||
|
|
|
@ -126,8 +126,9 @@ AM_CONDITIONAL([HAVE_GUILE_JSON], [test "x$have_guile_json" = "xyes"])
|
||||||
|
|
||||||
dnl Guile-Sqlite3 is used by the (guix store ...) modules.
|
dnl Guile-Sqlite3 is used by the (guix store ...) modules.
|
||||||
GUIX_CHECK_GUILE_SQLITE3
|
GUIX_CHECK_GUILE_SQLITE3
|
||||||
AM_CONDITIONAL([HAVE_GUILE_SQLITE3],
|
if test "x$guix_cv_have_recent_guile_sqlite3" != "xyes"; then
|
||||||
[test "x$guix_cv_have_recent_guile_sqlite3" = "xyes"])
|
AC_MSG_ERROR([A recent Guile-SQLite3 could not be found; please install it.])
|
||||||
|
fi
|
||||||
|
|
||||||
dnl Make sure we have a full-fledged Guile.
|
dnl Make sure we have a full-fledged Guile.
|
||||||
GUIX_ASSERT_GUILE_FEATURES([regex posix socket net-db threads])
|
GUIX_ASSERT_GUILE_FEATURES([regex posix socket net-db threads])
|
||||||
|
|
|
@ -615,6 +615,9 @@ later, including 2.2.x;
|
||||||
Guile,, gnutls-guile, GnuTLS-Guile});
|
Guile,, gnutls-guile, GnuTLS-Guile});
|
||||||
@item
|
@item
|
||||||
@c FIXME: Specify a version number once a release has been made.
|
@c FIXME: Specify a version number once a release has been made.
|
||||||
|
@uref{https://notabug.org/civodul/guile-sqlite3, Guile-SQLite3};
|
||||||
|
@item
|
||||||
|
@c FIXME: Specify a version number once a release has been made.
|
||||||
@uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, from August
|
@uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, from August
|
||||||
2017 or later;
|
2017 or later;
|
||||||
@item @url{http://zlib.net, zlib};
|
@item @url{http://zlib.net, zlib};
|
||||||
|
|
|
@ -213,12 +213,13 @@
|
||||||
(let* ((out (assoc-ref outputs "out"))
|
(let* ((out (assoc-ref outputs "out"))
|
||||||
(guile (assoc-ref inputs "guile"))
|
(guile (assoc-ref inputs "guile"))
|
||||||
(json (assoc-ref inputs "guile-json"))
|
(json (assoc-ref inputs "guile-json"))
|
||||||
|
(sqlite (assoc-ref inputs "guile-sqlite3"))
|
||||||
(git (assoc-ref inputs "guile-git"))
|
(git (assoc-ref inputs "guile-git"))
|
||||||
(bs (assoc-ref inputs
|
(bs (assoc-ref inputs
|
||||||
"guile-bytestructures"))
|
"guile-bytestructures"))
|
||||||
(ssh (assoc-ref inputs "guile-ssh"))
|
(ssh (assoc-ref inputs "guile-ssh"))
|
||||||
(gnutls (assoc-ref inputs "gnutls"))
|
(gnutls (assoc-ref inputs "gnutls"))
|
||||||
(deps (list json gnutls git bs ssh))
|
(deps (list json sqlite gnutls git bs ssh))
|
||||||
(effective
|
(effective
|
||||||
(read-line
|
(read-line
|
||||||
(open-pipe* OPEN_READ
|
(open-pipe* OPEN_READ
|
||||||
|
@ -275,6 +276,7 @@
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("gnutls" ,gnutls)
|
`(("gnutls" ,gnutls)
|
||||||
("guile-json" ,guile-json)
|
("guile-json" ,guile-json)
|
||||||
|
("guile-sqlite3" ,guile-sqlite3)
|
||||||
("guile-ssh" ,guile-ssh)
|
("guile-ssh" ,guile-ssh)
|
||||||
("guile-git" ,guile-git)))
|
("guile-git" ,guile-git)))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue