Merge branch 'master' into core-updates Conflicts: gnu/packages/image.scm
gnu: Consolidate databases in (gnu packages databases). * gnu/packages/databases.scm: New file, with the contents of the following deleted files. * gnu/packages/mysql.scm, gnu/packages/postgresql.scm, gnu/packages/recutils.scm, gnu/packages/sqlite.scm, gnu/packages/bdb.scm: Remove. * gnu-system.am (GNU_SYSTEM_MODULES): Adjust accordingly. * gnu/packages/apl.scm, gnu/packages/dc.scm, gnu/packages/games.scm, gnu/packages/gnunet.scm, gnu/packages/linux.scm, gnu/packages/mail.scm, gnu/packages/mpd.scm, gnu/packages/nvi.scm, gnu/packages/openldap.scm, gnu/packages/package-management.scm, gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/rdf.scm, gnu/packages/version-control.scm: Adjust to new module name.
Merge branch 'master' into core-updates
gnu: apl: Update to 1.4, add sqlite support. * gnu/packages/apl.scm (apl): Update to 1.4. Add 'sqlite' as an input. Pass --with-sqlite3 to configure.
gnu: apl: Upgrade to 1.3. * gnu/packages/apl.scm (apl): Upgrade to 1.3.
Merge branch 'master' into core-updates Conflicts: gnu-system.am
gnu: apl: Update to 1.2. * gnu/packages/apl.scm (apl): Update to 1.2.
Merge branch 'core-updates' Conflicts: gnu/packages/gnunet.scm
gnu: apl: Adjust to gettext renaming. * gnu/packages/apl.scm (apl): Use GNU-GETTEXT.
Merge branch 'master' into core-updates Conflicts: guix/packages.scm
gnu: Add GNU APL. * gnu/packages/apl.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it.