From 255d1bbe777a824be726edeb9fd47458a3a877a9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 16 Jan 2019 14:48:47 +0100 Subject: [PATCH] gnu: Move dbm databases to new module. * gnu/packages/databases.scm (gdbm, bdb, bdb-5.3): Move from here... * gnu/packages/dbm.scm: ...to this new module. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * gnu/packages/audio.scm, gnu/packages/avahi.scm, gnu/packages/backup.scm, gnu/packages/cobol.scm, gnu/packages/cyrus-sasl.scm, gnu/packages/databases.scm, gnu/packages/finance.scm, gnu/packages/game-development.scm, gnu/packages/gnome.scm, gnu/packages/guile.scm, gnu/packages/ibus.scm, gnu/packages/kerberos.scm, gnu/packages/linux.scm, gnu/packages/mail.scm, gnu/packages/man.scm, gnu/packages/nvi.scm, gnu/packages/openldap.scm, gnu/packages/package-management.scm, gnu/packages/php.scm, gnu/packages/pulseaudio.scm, gnu/packages/python.scm, gnu/packages/rdf.scm, gnu/packages/ruby.scm, gnu/packages/sawfish.scm: Update module references. --- gnu/local.mk | 1 + gnu/packages/audio.scm | 2 +- gnu/packages/avahi.scm | 2 +- gnu/packages/backup.scm | 1 + gnu/packages/cobol.scm | 2 +- gnu/packages/cyrus-sasl.scm | 2 +- gnu/packages/databases.scm | 126 +--------------------- gnu/packages/dbm.scm | 159 ++++++++++++++++++++++++++++ gnu/packages/finance.scm | 1 + gnu/packages/game-development.scm | 2 +- gnu/packages/gnome.scm | 1 + gnu/packages/guile.scm | 2 +- gnu/packages/ibus.scm | 1 + gnu/packages/kerberos.scm | 2 +- gnu/packages/linux.scm | 2 +- gnu/packages/mail.scm | 1 + gnu/packages/man.scm | 2 +- gnu/packages/nvi.scm | 2 +- gnu/packages/openldap.scm | 2 +- gnu/packages/package-management.scm | 2 +- gnu/packages/php.scm | 1 + gnu/packages/pulseaudio.scm | 2 +- gnu/packages/python.scm | 2 +- gnu/packages/rdf.scm | 2 +- gnu/packages/ruby.scm | 1 + gnu/packages/sawfish.scm | 2 +- 26 files changed, 184 insertions(+), 141 deletions(-) create mode 100644 gnu/packages/dbm.scm diff --git a/gnu/local.mk b/gnu/local.mk index a7da36f760..d8d75af615 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -126,6 +126,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/datamash.scm \ %D%/packages/datastructures.scm \ %D%/packages/dav.scm \ + %D%/packages/dbm.scm \ %D%/packages/dc.scm \ %D%/packages/debian.scm \ %D%/packages/debug.scm \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 569ca0fc25..bc6c51834a 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -57,7 +57,7 @@ #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) - #:use-module (gnu packages databases) + #:use-module (gnu packages dbm) #:use-module (gnu packages emacs) #:use-module (gnu packages file) #:use-module (gnu packages flex) diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index df74437631..e71ffc2982 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -24,7 +24,7 @@ #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (gnu packages) - #:use-module (gnu packages databases) + #:use-module (gnu packages dbm) #:use-module (gnu packages libdaemon) #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 85fb6c5b83..5d9013552e 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -46,6 +46,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages databases) + #:use-module (gnu packages dbm) #:use-module (gnu packages dejagnu) #:use-module (gnu packages ftp) #:use-module (gnu packages glib) diff --git a/gnu/packages/cobol.scm b/gnu/packages/cobol.scm index 75c8c53bbe..257527e3b8 100644 --- a/gnu/packages/cobol.scm +++ b/gnu/packages/cobol.scm @@ -22,7 +22,7 @@ #:use-module (guix licenses) #:use-module (guix packages) #:use-module (guix download) - #:use-module (gnu packages databases) + #:use-module (gnu packages dbm) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) #:use-module (gnu packages perl)) diff --git a/gnu/packages/cyrus-sasl.scm b/gnu/packages/cyrus-sasl.scm index 60c1e0ef94..a202f10e94 100644 --- a/gnu/packages/cyrus-sasl.scm +++ b/gnu/packages/cyrus-sasl.scm @@ -20,7 +20,7 @@ (define-module (gnu packages cyrus-sasl) #:use-module (gnu packages) - #:use-module (gnu packages databases) + #:use-module (gnu packages dbm) #:use-module (gnu packages kerberos) #:use-module (gnu packages tls) #:use-module ((guix licenses) #:prefix license:) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index c3d29b8775..655e7c3a32 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -64,6 +64,7 @@ #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) + #:use-module (gnu packages dbm) #:use-module (gnu packages emacs) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -161,28 +162,6 @@ either single machines or networked clusters.") (license license:gpl3+))) -(define-public gdbm - (package - (name "gdbm") - (version "1.18") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/gdbm/gdbm-" - version ".tar.gz")) - (sha256 - (base32 - "1kimnv12bzjjhaqk4c8w2j6chdj9c6bg21lchaf7abcyfss2r0mq")))) - (arguments `(#:configure-flags '("--enable-libgdbm-compat"))) - (build-system gnu-build-system) - (home-page "http://www.gnu.org.ua/software/gdbm") - (synopsis - "Hash library of database functions compatible with traditional dbm") - (description - "GDBM is a library for manipulating hashed databases. It is used to -store key/value pairs in a file in a manner similar to the Unix dbm library -and provides interfaces to the traditional file format.") - (license license:gpl3+))) - (define-public go-gopkg.in-mgo.v2 (package (name "go-gopkg.in-mgo.v2") @@ -229,109 +208,6 @@ standard Go idioms.") (home-page "http://labix.org/mgo") (license license:bsd-2))) -(define-public bdb - (package - (name "bdb") - (version "6.2.32") - (source (origin - (method url-fetch) - (uri (string-append "http://download.oracle.com/berkeley-db/db-" - version ".tar.gz")) - (sha256 - (base32 - "1yx8wzhch5wwh016nh0kfxvknjkafv6ybkqh6nh7lxx50jqf5id9")))) - (build-system gnu-build-system) - (outputs '("out" ; programs, libraries, headers - "doc")) ; 94 MiB of HTML docs - (arguments - '(#:tests? #f ; no check target available - #:disallowed-references ("doc") - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - ;; '--docdir' is not honored, so we need to patch. - (substitute* "dist/Makefile.in" - (("docdir[[:blank:]]*=.*") - (string-append "docdir = " doc "/share/doc/bdb"))) - - (invoke "./dist/configure" - (string-append "--prefix=" out) - (string-append "CONFIG_SHELL=" (which "bash")) - (string-append "SHELL=" (which "bash")) - - ;; Remove 7 MiB of .a files. - "--disable-static" - - ;; The compatibility mode is needed by some packages, - ;; notably iproute2. - "--enable-compat185" - - ;; The following flag is needed so that the inclusion - ;; of db_cxx.h into C++ files works; it leads to - ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h. - "--enable-cxx"))))))) - (synopsis "Berkeley database") - (description - "Berkeley DB is an embeddable database allowing developers the choice of -SQL, Key/Value, XML/XQuery or Java Object storage for their data model.") - ;; Starting with version 6, BDB is distributed under AGPL3. Many individual - ;; files are covered by the 3-clause BSD license. - (license (list license:agpl3+ license:bsd-3)) - (home-page - "http://www.oracle.com/us/products/database/berkeley-db/overview/index.html"))) - -(define-public bdb-5.3 - (package (inherit bdb) - (name "bdb") - (version "5.3.28") - (license (license:non-copyleft "file://LICENSE" - "See LICENSE in the distribution.")) - (source (origin - (method url-fetch) - (uri (string-append "http://download.oracle.com/berkeley-db/db-" - version ".tar.gz")) - (sha256 - (base32 - "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0")))) - (arguments - `(#:tests? #f ; no check target available - #:disallowed-references ("doc") - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - ;; '--docdir' is not honored, so we need to patch. - (substitute* "dist/Makefile.in" - (("docdir[[:blank:]]*=.*") - (string-append "docdir = " doc "/share/doc/bdb"))) - - (invoke "./dist/configure" - (string-append "--prefix=" out) - (string-append "CONFIG_SHELL=" (which "bash")) - (string-append "SHELL=" (which "bash")) - - ;; Bdb doesn't recognize aarch64 as an architecture. - ,@(if (string=? "aarch64-linux" (%current-system)) - '("--build=aarch64-unknown-linux-gnu") - '()) - - ;; Remove 7 MiB of .a files. - "--disable-static" - - ;; The compatibility mode is needed by some packages, - ;; notably iproute2. - "--enable-compat185" - - ;; The following flag is needed so that the inclusion - ;; of db_cxx.h into C++ files works; it leads to - ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h. - "--enable-cxx"))))))))) - (define-public es-dump-restore (package (name "es-dump-restore") diff --git a/gnu/packages/dbm.scm b/gnu/packages/dbm.scm new file mode 100644 index 0000000000..bf548a25f3 --- /dev/null +++ b/gnu/packages/dbm.scm @@ -0,0 +1,159 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2012, 2013, 2014, 2016 Ludovic Courtès +;;; Copyright © 2013, 2015 Andreas Enge +;;; Copyright © 2016, 2017, 2018 Efraim Flashner +;;; Copyright © 2017, 2018 Marius Bakke +;;; Copyright © 2018 Mark H Weaver +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages dbm) + #:use-module (gnu packages) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (guix utils)) + +;;; Commentary: +;;; +;;; This module has been separated from (gnu packages databases) to reduce the +;;; number of module references for core packages. + +(define-public bdb + (package + (name "bdb") + (version "6.2.32") + (source (origin + (method url-fetch) + (uri (string-append "http://download.oracle.com/berkeley-db/db-" + version ".tar.gz")) + (sha256 + (base32 + "1yx8wzhch5wwh016nh0kfxvknjkafv6ybkqh6nh7lxx50jqf5id9")))) + (build-system gnu-build-system) + (outputs '("out" ; programs, libraries, headers + "doc")) ; 94 MiB of HTML docs + (arguments + '(#:tests? #f ; no check target available + #:disallowed-references ("doc") + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + ;; '--docdir' is not honored, so we need to patch. + (substitute* "dist/Makefile.in" + (("docdir[[:blank:]]*=.*") + (string-append "docdir = " doc "/share/doc/bdb"))) + + (invoke "./dist/configure" + (string-append "--prefix=" out) + (string-append "CONFIG_SHELL=" (which "bash")) + (string-append "SHELL=" (which "bash")) + + ;; Remove 7 MiB of .a files. + "--disable-static" + + ;; The compatibility mode is needed by some packages, + ;; notably iproute2. + "--enable-compat185" + + ;; The following flag is needed so that the inclusion + ;; of db_cxx.h into C++ files works; it leads to + ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h. + "--enable-cxx"))))))) + (synopsis "Berkeley database") + (description + "Berkeley DB is an embeddable database allowing developers the choice of +SQL, Key/Value, XML/XQuery or Java Object storage for their data model.") + ;; Starting with version 6, BDB is distributed under AGPL3. Many individual + ;; files are covered by the 3-clause BSD license. + (license (list license:agpl3+ license:bsd-3)) + (home-page + "http://www.oracle.com/us/products/database/berkeley-db/overview/index.html"))) + +(define-public bdb-5.3 + (package (inherit bdb) + (name "bdb") + (version "5.3.28") + (license (license:non-copyleft "file://LICENSE" + "See LICENSE in the distribution.")) + (source (origin + (method url-fetch) + (uri (string-append "http://download.oracle.com/berkeley-db/db-" + version ".tar.gz")) + (sha256 + (base32 + "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0")))) + (arguments + `(#:tests? #f ; no check target available + #:disallowed-references ("doc") + #:phases + (modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + ;; '--docdir' is not honored, so we need to patch. + (substitute* "dist/Makefile.in" + (("docdir[[:blank:]]*=.*") + (string-append "docdir = " doc "/share/doc/bdb"))) + + (invoke "./dist/configure" + (string-append "--prefix=" out) + (string-append "CONFIG_SHELL=" (which "bash")) + (string-append "SHELL=" (which "bash")) + + ;; Bdb doesn't recognize aarch64 as an architecture. + ,@(if (string=? "aarch64-linux" (%current-system)) + '("--build=aarch64-unknown-linux-gnu") + '()) + + ;; Remove 7 MiB of .a files. + "--disable-static" + + ;; The compatibility mode is needed by some packages, + ;; notably iproute2. + "--enable-compat185" + + ;; The following flag is needed so that the inclusion + ;; of db_cxx.h into C++ files works; it leads to + ;; HAVE_CXX_STDHEADERS being defined in db_cxx.h. + "--enable-cxx"))))))))) + +(define-public gdbm + (package + (name "gdbm") + (version "1.18") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/gdbm/gdbm-" + version ".tar.gz")) + (sha256 + (base32 + "1kimnv12bzjjhaqk4c8w2j6chdj9c6bg21lchaf7abcyfss2r0mq")))) + (arguments `(#:configure-flags '("--enable-libgdbm-compat"))) + (build-system gnu-build-system) + (home-page "http://www.gnu.org.ua/software/gdbm") + (synopsis + "Hash library of database functions compatible with traditional dbm") + (description + "GDBM is a library for manipulating hashed databases. It is used to +store key/value pairs in a file in a manner similar to the Unix dbm library +and provides interfaces to the traditional file format.") + (license license:gpl3+))) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index f41b4b1e34..6f223ea9dc 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -44,6 +44,7 @@ #:use-module (gnu packages documentation) #:use-module (gnu packages dns) #:use-module (gnu packages emacs) + #:use-module (gnu packages dbm) #:use-module (gnu packages graphviz) #:use-module (gnu packages groff) #:use-module (gnu packages libedit) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 06a915cdea..96dc3436b4 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -46,13 +46,13 @@ #:use-module (gnu packages boost) #:use-module (gnu packages compression) #:use-module (gnu packages curl) - #:use-module (gnu packages databases) #:use-module (gnu packages documentation) #:use-module (gnu packages fltk) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages fribidi) + #:use-module (gnu packages dbm) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 14adf65f61..4a74a08cda 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -75,6 +75,7 @@ #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages databases) + #:use-module (gnu packages dbm) #:use-module (gnu packages djvu) #:use-module (gnu packages dns) #:use-module (gnu packages documentation) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index a0bd004f0d..4aea391e19 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -45,7 +45,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages bdw-gc) #:use-module (gnu packages compression) - #:use-module (gnu packages databases) + #:use-module (gnu packages dbm) #:use-module (gnu packages ed) #:use-module (gnu packages flex) #:use-module (gnu packages gawk) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 58d48b1577..5575e5b3f4 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages cmake) #:use-module (gnu packages databases) #:use-module (gnu packages datastructures) + #:use-module (gnu packages dbm) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 2fb1e41141..f52bb62c23 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -28,7 +28,7 @@ #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages bison) - #:use-module (gnu packages databases) + #:use-module (gnu packages dbm) #:use-module (gnu packages perl) #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a1e5d0024b..334d24b7e8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -65,7 +65,7 @@ #:use-module (gnu packages crypto) #:use-module (gnu packages cryptsetup) #:use-module (gnu packages compression) - #:use-module (gnu packages databases) + #:use-module (gnu packages dbm) #:use-module (gnu packages datastructures) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index e556077423..5777374582 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -58,6 +58,7 @@ #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages databases) + #:use-module (gnu packages dbm) #:use-module (gnu packages dejagnu) #:use-module (gnu packages django) #:use-module (gnu packages dns) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 8989dd230b..68d6c16178 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -27,7 +27,7 @@ #:use-module (guix download) #:use-module (guix packages) #:use-module (guix build-system gnu) - #:use-module (gnu packages databases) + #:use-module (gnu packages dbm) #:use-module (gnu packages flex) #:use-module (gnu packages gawk) #:use-module (gnu packages groff) diff --git a/gnu/packages/nvi.scm b/gnu/packages/nvi.scm index ea02762a9b..187de31720 100644 --- a/gnu/packages/nvi.scm +++ b/gnu/packages/nvi.scm @@ -18,7 +18,7 @@ (define-module (gnu packages nvi) #:use-module (gnu packages) - #:use-module (gnu packages databases) + #:use-module (gnu packages dbm) #:use-module (gnu packages ncurses) #:use-module (guix packages) #:use-module (guix download) diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm index cb33ca80df..f65ba5245d 100644 --- a/gnu/packages/openldap.scm +++ b/gnu/packages/openldap.scm @@ -25,7 +25,7 @@ #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages cyrus-sasl) - #:use-module (gnu packages databases) + #:use-module (gnu packages dbm) #:use-module (gnu packages documentation) #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 10153ca062..ea365600bc 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -41,7 +41,7 @@ #:use-module (gnu packages cpio) #:use-module (gnu packages crypto) #:use-module (gnu packages curl) - #:use-module (gnu packages databases) + #:use-module (gnu packages dbm) #:use-module (gnu packages docbook) #:use-module (gnu packages emacs) #:use-module (gnu packages file) diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 2fbb37ce56..3b925e1740 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -30,6 +30,7 @@ #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages databases) + #:use-module (gnu packages dbm) #:use-module (gnu packages fontutils) #:use-module (gnu packages gd) #:use-module (gnu packages gettext) diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 35d499522b..7001a8137b 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -36,7 +36,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) #:use-module (gnu packages check) - #:use-module (gnu packages databases) + #:use-module (gnu packages dbm) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages libcanberra) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 44a3c322de..1c4ea720f1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -78,7 +78,7 @@ #:use-module (gnu packages) #:use-module (gnu packages bash) #:use-module (gnu packages compression) - #:use-module (gnu packages databases) + #:use-module (gnu packages dbm) #:use-module (gnu packages libffi) #:use-module (gnu packages pkg-config) #:use-module (gnu packages readline) diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index dcdee359b4..7fd893c374 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -30,13 +30,13 @@ #:use-module (guix build-system waf) #:use-module (gnu packages) #:use-module (gnu packages autotools) - #:use-module (gnu packages databases) #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages documentation) + #:use-module (gnu packages dbm) #:use-module (gnu packages gnupg) #:use-module (gnu packages linux) #:use-module (gnu packages multiprecision) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e14d1371a3..c6a65ffc58 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -34,6 +34,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages databases) + #:use-module (gnu packages dbm) #:use-module (gnu packages readline) #:use-module (gnu packages autotools) #:use-module (gnu packages java) diff --git a/gnu/packages/sawfish.scm b/gnu/packages/sawfish.scm index 8795d8d9fb..1ac72f2baa 100644 --- a/gnu/packages/sawfish.scm +++ b/gnu/packages/sawfish.scm @@ -24,7 +24,7 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages autotools) - #:use-module (gnu packages databases) + #:use-module (gnu packages dbm) #:use-module (gnu packages gettext) #:use-module (gnu packages gtk) #:use-module (gnu packages libffi) -- 2.20.1