From 44d10b1f722856ab8e9b942804aa7ef33e2ef739 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 15 Jan 2019 14:21:30 +0100 Subject: gnu: Separate Python core packages from the rest. * gnu/packages/python.scm: Move hundreds of package definitions from here... * gnu/packages/python-xyz.scm: ...to this new module. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * gnu/packages/ada.scm, gnu/packages/admin.scm, gnu/packages/android.scm, gnu/packages/audio.scm, gnu/packages/backup.scm, gnu/packages/benchmark.scm, gnu/packages/bioinformatics.scm, gnu/packages/bittorrent.scm, gnu/packages/calendar.scm, gnu/packages/check.scm, gnu/packages/chemistry.scm, gnu/packages/cluster.scm, gnu/packages/compression.scm, gnu/packages/connman.scm, gnu/packages/crypto.scm, gnu/packages/cups.scm, gnu/packages/databases.scm, gnu/packages/dav.scm, gnu/packages/direct-connect.scm, gnu/packages/disk.scm, gnu/packages/django.scm, gnu/packages/dlang.scm, gnu/packages/docker.scm, gnu/packages/ebook.scm, gnu/packages/elf.scm, gnu/packages/emacs.scm, gnu/packages/emulators.scm, gnu/packages/engineering.scm, gnu/packages/enlightenment.scm, gnu/packages/finance.scm, gnu/packages/fltk.scm, gnu/packages/fontutils.scm, gnu/packages/freedesktop.scm, gnu/packages/game-development.scm, gnu/packages/games.scm, gnu/packages/geo.scm, gnu/packages/gl.scm, gnu/packages/glib.scm, gnu/packages/gnome.scm, gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm, gnu/packages/graph.scm, gnu/packages/graphics.scm, gnu/packages/graphviz.scm, gnu/packages/gtk.scm, gnu/packages/ham-radio.scm, gnu/packages/image-processing.scm, gnu/packages/image-viewers.scm, gnu/packages/image.scm, gnu/packages/irc.scm, gnu/packages/jrnl.scm, gnu/packages/julia.scm, gnu/packages/kde-frameworks.scm, gnu/packages/key-mon.scm, gnu/packages/libffi.scm, gnu/packages/libreoffice.scm, gnu/packages/libusb.scm, gnu/packages/lirc.scm, gnu/packages/logging.scm, gnu/packages/machine-learning.scm, gnu/packages/mail.scm, gnu/packages/mate.scm, gnu/packages/maths.scm, gnu/packages/medical.scm, gnu/packages/messaging.scm, gnu/packages/monitoring.scm, gnu/packages/mp3.scm, gnu/packages/mpd.scm, gnu/packages/music.scm, gnu/packages/networking.scm, gnu/packages/nutrition.scm, gnu/packages/openldap.scm, gnu/packages/openstack.scm, gnu/packages/package-management.scm, gnu/packages/password-utils.scm, gnu/packages/patchutils.scm, gnu/packages/pdf.scm, gnu/packages/photo.scm, gnu/packages/polkit.scm, gnu/packages/protobuf.scm, gnu/packages/python-crypto.scm, gnu/packages/python-web.scm, gnu/packages/qt.scm, gnu/packages/rdf.scm, gnu/packages/ruby.scm, gnu/packages/search.scm, gnu/packages/selinux.scm, gnu/packages/serialization.scm, gnu/packages/shells.scm, gnu/packages/simulation.scm, gnu/packages/ssh.scm, gnu/packages/statistics.scm, gnu/packages/storage.scm, gnu/packages/sync.scm, gnu/packages/terminals.scm, gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tls.scm, gnu/packages/tor.scm, gnu/packages/tryton.scm, gnu/packages/version-control.scm, gnu/packages/video.scm, gnu/packages/virtualization.scm, gnu/packages/vpn.scm, gnu/packages/web-browsers.scm, gnu/packages/web.scm, gnu/packages/wicd.scm, gnu/packages/xdisorg.scm, gnu/packages/xorg.scm: Update module references. --- gnu/packages/gnome.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1ffdc25010..b578fd91fa 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -120,6 +120,7 @@ (define-module (gnu packages gnome) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages rdesktop) #:use-module (gnu packages scanner) #:use-module (gnu packages selinux) -- cgit v1.2.3 From cd0322a3efd96577de9ab35e4432d1ae399257c8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 15 Jan 2019 21:47:05 +0100 Subject: gnu: Move sqlite to separate module. * gnu/packages/databases.scm (sqlite, sqlite-3.26.0, sqlite-with-fts5, sqlite-with-column-metadata): Move variables from here... * gnu/packages/sqlite.scm: ...to this new module. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * gnu/packages/apl.scm, gnu/packages/bittorrent.scm, gnu/packages/calendar.scm, gnu/packages/code.scm, gnu/packages/crypto.scm, gnu/packages/databases.scm, gnu/packages/dc.scm, gnu/packages/disk.scm, gnu/packages/ebook.scm, gnu/packages/education.scm, gnu/packages/emacs.scm, gnu/packages/emulators.scm, gnu/packages/file-systems.scm, gnu/packages/freedesktop.scm, gnu/packages/ftp.scm, gnu/packages/games.scm, gnu/packages/geo.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm, gnu/packages/gps.scm, gnu/packages/guile.scm, gnu/packages/ibus.scm, gnu/packages/kerberos.scm, gnu/packages/kodi.scm, gnu/packages/lisp.scm, gnu/packages/mail.scm, gnu/packages/messaging.scm, gnu/packages/mpd.scm, gnu/packages/music.scm, gnu/packages/networking.scm, gnu/packages/nfs.scm, gnu/packages/ocaml.scm, gnu/packages/package-management.scm, gnu/packages/pdf.scm, gnu/packages/photo.scm, gnu/packages/php.scm, gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/ruby.scm, gnu/packages/scheme.scm, gnu/packages/sync.scm, gnu/packages/syndication.scm, gnu/packages/version-control.scm, gnu/packages/video.scm, gnu/packages/web-browsers.scm, gnu/packages/webkit.scm: Adjust module references. --- gnu/local.mk | 1 + gnu/packages/apl.scm | 4 +- gnu/packages/bittorrent.scm | 2 +- gnu/packages/calendar.scm | 2 +- gnu/packages/code.scm | 2 +- gnu/packages/crypto.scm | 2 +- gnu/packages/databases.scm | 82 +---------------------- gnu/packages/dc.scm | 2 +- gnu/packages/disk.scm | 2 +- gnu/packages/ebook.scm | 1 + gnu/packages/education.scm | 2 +- gnu/packages/emacs.scm | 1 + gnu/packages/emulators.scm | 2 +- gnu/packages/file-systems.scm | 2 +- gnu/packages/freedesktop.scm | 2 +- gnu/packages/ftp.scm | 2 +- gnu/packages/games.scm | 2 +- gnu/packages/geo.scm | 1 + gnu/packages/gnome.scm | 1 + gnu/packages/gnunet.scm | 2 +- gnu/packages/gnupg.scm | 2 +- gnu/packages/gnuzilla.scm | 3 +- gnu/packages/gps.scm | 4 +- gnu/packages/guile.scm | 1 + gnu/packages/ibus.scm | 1 + gnu/packages/kerberos.scm | 3 +- gnu/packages/kodi.scm | 1 + gnu/packages/lisp.scm | 1 + gnu/packages/mail.scm | 1 + gnu/packages/messaging.scm | 1 + gnu/packages/mpd.scm | 2 +- gnu/packages/music.scm | 2 +- gnu/packages/networking.scm | 2 +- gnu/packages/nfs.scm | 2 +- gnu/packages/ocaml.scm | 2 +- gnu/packages/package-management.scm | 1 + gnu/packages/pdf.scm | 2 +- gnu/packages/photo.scm | 2 +- gnu/packages/php.scm | 1 + gnu/packages/python.scm | 1 + gnu/packages/qt.scm | 1 + gnu/packages/ruby.scm | 1 + gnu/packages/scheme.scm | 3 +- gnu/packages/sqlite.scm | 125 ++++++++++++++++++++++++++++++++++++ gnu/packages/sync.scm | 2 +- gnu/packages/syndication.scm | 2 +- gnu/packages/version-control.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/web-browsers.scm | 2 +- gnu/packages/webkit.scm | 2 +- 50 files changed, 179 insertions(+), 115 deletions(-) create mode 100644 gnu/packages/sqlite.scm (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/local.mk b/gnu/local.mk index be123cefd8..a7da36f760 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -413,6 +413,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/sml.scm \ %D%/packages/speech.scm \ %D%/packages/spice.scm \ + %D%/packages/sqlite.scm \ %D%/packages/ssh.scm \ %D%/packages/sssd.scm \ %D%/packages/stalonetray.scm \ diff --git a/gnu/packages/apl.scm b/gnu/packages/apl.scm index aa47edcd64..88150dc4d0 100644 --- a/gnu/packages/apl.scm +++ b/gnu/packages/apl.scm @@ -25,8 +25,8 @@ (define-module (gnu packages apl) #:use-module (guix build-system gnu) #:use-module (gnu packages gettext) #:use-module (gnu packages maths) - #:use-module (gnu packages databases) - #:use-module (gnu packages readline)) + #:use-module (gnu packages readline) + #:use-module (gnu packages sqlite)) (define-public apl (package diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 4925aaec85..00b115cb9c 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -41,7 +41,6 @@ (define-module (gnu packages bittorrent) #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) - #:use-module (gnu packages databases) #:use-module (gnu packages file) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) @@ -59,6 +58,7 @@ (define-module (gnu packages bittorrent) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) + #:use-module (gnu packages sqlite) #:use-module (gnu packages ssh) #:use-module (gnu packages tls) #:use-module (gnu packages xml)) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 41002af6c5..f1949c14c0 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -32,7 +32,6 @@ (define-module (gnu packages calendar) #:use-module (guix build-system python) #:use-module (gnu packages base) #:use-module (gnu packages check) - #:use-module (gnu packages databases) #:use-module (gnu packages dav) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) @@ -41,6 +40,7 @@ (define-module (gnu packages calendar) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sqlite) #:use-module (gnu packages time) #:use-module (gnu packages xml) #:use-module (srfi srfi-26)) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 357125d047..3a575ad380 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -42,7 +42,6 @@ (define-module (gnu packages code) #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) - #:use-module (gnu packages databases) #:use-module (gnu packages emacs) #:use-module (gnu packages gcc) #:use-module (gnu packages graphviz) @@ -50,6 +49,7 @@ (define-module (gnu packages code) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages ncurses) #:use-module (gnu packages llvm) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 77d836bdaf..2c63e53191 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -39,7 +39,6 @@ (define-module (gnu packages crypto) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages cryptsetup) - #:use-module (gnu packages databases) #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) #:use-module (gnu packages image) @@ -58,6 +57,7 @@ (define-module (gnu packages crypto) #:use-module (gnu packages search) #:use-module (gnu packages serialization) #:use-module (gnu packages shells) + #:use-module (gnu packages sqlite) #:use-module (gnu packages tcl) #:use-module (gnu packages tls) #:use-module (gnu packages xml) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 043d61fee2..c3d29b8775 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -90,6 +90,7 @@ (define-module (gnu packages databases) #:use-module (gnu packages readline) #:use-module (gnu packages ruby) #:use-module (gnu packages serialization) + #:use-module (gnu packages sqlite) #:use-module (gnu packages tcl) #:use-module (gnu packages terminals) #:use-module (gnu packages textutils) @@ -1144,87 +1145,6 @@ (define-public sqlcrush changes.") (license license:gpl3+)))) ; no headers, see README.md -(define-public sqlite - (package - (name "sqlite") - (replacement sqlite-3.26.0) - (version "3.24.0") - (source (origin - (method url-fetch) - (uri (let ((numeric-version - (match (string-split version #\.) - ((first-digit other-digits ...) - (string-append first-digit - (string-pad-right - (string-concatenate - (map (cut string-pad <> 2 #\0) - other-digits)) - 6 #\0)))))) - (string-append "https://sqlite.org/2018/sqlite-autoconf-" - numeric-version ".tar.gz"))) - (sha256 - (base32 - "0jmprv2vpggzhy7ma4ynmv1jzn3pfiwzkld0kkg6hvgvqs44xlfr")))) - (build-system gnu-build-system) - (inputs `(("readline" ,readline))) - (arguments - `(#:configure-flags - ;; Add -DSQLITE_SECURE_DELETE, -DSQLITE_ENABLE_UNLOCK_NOTIFY and - ;; -DSQLITE_ENABLE_DBSTAT_VTAB to CFLAGS. GNU Icecat will refuse - ;; to use the system SQLite unless these options are enabled. - (list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE " - "-DSQLITE_ENABLE_UNLOCK_NOTIFY " - "-DSQLITE_ENABLE_DBSTAT_VTAB")))) - (home-page "https://www.sqlite.org/") - (synopsis "The SQLite database management system") - (description - "SQLite is a software library that implements a self-contained, serverless, -zero-configuration, transactional SQL database engine. SQLite is the most -widely deployed SQL database engine in the world. The source code for SQLite -is in the public domain.") - (license license:public-domain))) - -(define-public sqlite-3.26.0 - (package (inherit sqlite) - (version "3.26.0") - (source (origin - (method url-fetch) - (uri (let ((numeric-version - (match (string-split version #\.) - ((first-digit other-digits ...) - (string-append first-digit - (string-pad-right - (string-concatenate - (map (cut string-pad <> 2 #\0) - other-digits)) - 6 #\0)))))) - (string-append "https://sqlite.org/2018/sqlite-autoconf-" - numeric-version ".tar.gz"))) - (sha256 - (base32 - "0pdzszb4sp73hl36siiv3p300jvfvbcdxi2rrmkwgs6inwznmajx")))))) - -;; This is used by Tracker. -(define-public sqlite-with-fts5 - (package/inherit sqlite - (name "sqlite-with-fts5") - (arguments - (substitute-keyword-arguments (package-arguments sqlite) - ((#:configure-flags flags) - `(cons "--enable-fts5" ,flags)))))) - -;; This is used by Qt. -(define-public sqlite-with-column-metadata - (package/inherit sqlite - (name "sqlite-with-column-metadata") - (arguments - (substitute-keyword-arguments (package-arguments sqlite) - ((#:configure-flags flags) - `(list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE " - "-DSQLITE_ENABLE_UNLOCK_NOTIFY " - "-DSQLITE_ENABLE_DBSTAT_VTAB " - "-DSQLITE_ENABLE_COLUMN_METADATA"))))))) - (define-public tdb (package (name "tdb") diff --git a/gnu/packages/dc.scm b/gnu/packages/dc.scm index ae019da6e8..29d5e451d2 100644 --- a/gnu/packages/dc.scm +++ b/gnu/packages/dc.scm @@ -23,7 +23,7 @@ (define-module (gnu packages dc) #:use-module (gnu packages glib) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages databases) + #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (guix packages) #:use-module (guix download) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 72b12f6dd9..ceacd98a43 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -38,7 +38,6 @@ (define-module (gnu packages disk) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages cryptsetup) - #:use-module (gnu packages databases) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages elf) @@ -57,6 +56,7 @@ (define-module (gnu packages disk) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) + #:use-module (gnu packages sqlite) #:use-module (gnu packages swig) #:use-module (gnu packages vim) #:use-module (gnu packages w3m) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index e073e58ac9..285925866c 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -49,6 +49,7 @@ (define-module (gnu packages ebook) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages serialization) + #:use-module (gnu packages sqlite) #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages web) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index ef97d58a84..5b899f4e78 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -27,7 +27,6 @@ (define-module (gnu packages education) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages compression) - #:use-module (gnu packages databases) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -40,6 +39,7 @@ (define-module (gnu packages education) #:use-module (gnu packages python) #:use-module (gnu packages qt) #:use-module (gnu packages sdl) + #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages xorg) #:use-module (gnu packages xml) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index fe4922756d..567c1a2312 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -116,6 +116,7 @@ (define-module (gnu packages emacs) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages xdisorg) #:use-module (gnu packages shells) + #:use-module (gnu packages sqlite) #:use-module (gnu packages gnupg) #:use-module (gnu packages video) #:use-module (gnu packages haskell) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 3bd3cc0774..9a0d1e9b17 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -41,7 +41,6 @@ (define-module (gnu packages emulators) #:use-module (gnu packages backup) #:use-module (gnu packages compression) #:use-module (gnu packages curl) - #:use-module (gnu packages databases) #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) @@ -68,6 +67,7 @@ (define-module (gnu packages emulators) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages sdl) + #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 93d1561948..9260fdf946 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -35,7 +35,6 @@ (define-module (gnu packages file-systems) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) - #:use-module (gnu packages databases) #:use-module (gnu packages datastructures) #:use-module (gnu packages documentation) #:use-module (gnu packages docbook) @@ -45,6 +44,7 @@ (define-module (gnu packages file-systems) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages readline) + #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages xml)) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 63f0fb4be0..86222017cf 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -49,7 +49,6 @@ (define-module (gnu packages freedesktop) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages cryptsetup) - #:use-module (gnu packages databases) #:use-module (gnu packages disk) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) @@ -72,6 +71,7 @@ (define-module (gnu packages freedesktop) #:use-module (gnu packages polkit) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sqlite) #:use-module (gnu packages valgrind) #:use-module (gnu packages w3m) #:use-module (gnu packages web) diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index dd8af33972..8ad782ad85 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -29,7 +29,6 @@ (define-module (gnu packages ftp) #:use-module (gnu packages autotools) #:use-module (gnu packages check) #:use-module (gnu packages compression) - #:use-module (gnu packages databases) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -39,6 +38,7 @@ (define-module (gnu packages ftp) #:use-module (gnu packages nettle) #:use-module (gnu packages pkg-config) #:use-module (gnu packages readline) + #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xml)) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index bdf184ddab..88ca684158 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -79,7 +79,6 @@ (define-module (gnu packages games) #:use-module (gnu packages curl) #:use-module (gnu packages crypto) #:use-module (gnu packages cyrus-sasl) - #:use-module (gnu packages databases) #:use-module (gnu packages documentation) #:use-module (gnu packages docbook) #:use-module (gnu packages flex) @@ -131,6 +130,7 @@ (define-module (gnu packages games) #:use-module (gnu packages shells) #:use-module (gnu packages sdl) #:use-module (gnu packages serialization) + #:use-module (gnu packages sqlite) #:use-module (gnu packages swig) #:use-module (gnu packages tcl) #:use-module (gnu packages texinfo) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 7b54cdf9a8..0526566e65 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -53,6 +53,7 @@ (define-module (gnu packages geo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sqlite) #:use-module (gnu packages web) #:use-module (gnu packages webkit) #:use-module (gnu packages wxwidgets) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b578fd91fa..14adf65f61 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -125,6 +125,7 @@ (define-module (gnu packages gnome) #:use-module (gnu packages scanner) #:use-module (gnu packages selinux) #:use-module (gnu packages slang) + #:use-module (gnu packages sqlite) #:use-module (gnu packages ssh) #:use-module (gnu packages xml) #:use-module (gnu packages gl) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 1a3191fc31..c40581ea1f 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -53,7 +53,7 @@ (define-module (gnu packages gnunet) #:use-module (gnu packages perl) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) - #:use-module (gnu packages databases) + #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages web) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 628ba01c21..145130f042 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -52,13 +52,13 @@ (define-module (gnu packages gnupg) #:use-module (gnu packages qt) #:use-module (gnu packages readline) #:use-module (gnu packages compression) - #:use-module (gnu packages databases) #:use-module (gnu packages gtk) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages pkg-config) #:use-module (gnu packages ncurses) #:use-module (gnu packages security-token) + #:use-module (gnu packages sqlite) #:use-module (gnu packages swig) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 12ad6bf75d..9999622b8e 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -68,7 +68,8 @@ (define-module (gnu packages gnuzilla) #:use-module (gnu packages video) #:use-module (gnu packages xiph) #:use-module (gnu packages xdisorg) - #:use-module (gnu packages readline)) + #:use-module (gnu packages readline) + #:use-module (gnu packages sqlite)) (define-public mozjs (package diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 3fe7b6509c..92f6a4f977 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -29,12 +29,12 @@ (define-module (gnu packages gps) #:use-module (gnu packages base) #:use-module (gnu packages pkg-config) #:use-module (gnu packages compression) - #:use-module (gnu packages databases) #:use-module (gnu packages docbook) #:use-module (gnu packages image) #:use-module (gnu packages xml) #:use-module (gnu packages gtk) - #:use-module (gnu packages qt)) + #:use-module (gnu packages qt) + #:use-module (gnu packages sqlite)) (define-public gpsbabel (package diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index da4d006a6d..a0bd004f0d 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -68,6 +68,7 @@ (define-module (gnu packages guile) #:use-module (gnu packages readline) #:use-module (gnu packages sdl) #:use-module (gnu packages slang) + #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index b994beb560..58d48b1577 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -48,6 +48,7 @@ (define-module (gnu packages ibus) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages serialization) + #:use-module (gnu packages sqlite) #:use-module (gnu packages textutils) #:use-module (gnu packages xorg)) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 508f9c4bd2..2fb1e41141 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -28,6 +28,7 @@ (define-module (gnu packages kerberos) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages bison) + #:use-module (gnu packages databases) #:use-module (gnu packages perl) #:use-module (gnu packages gettext) #:use-module (gnu packages gnupg) @@ -35,8 +36,8 @@ (define-module (gnu packages kerberos) #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) #:use-module (gnu packages compression) - #:use-module (gnu packages databases) #:use-module (gnu packages readline) + #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) #:use-module ((guix licenses) #:prefix license:) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 0b6a746e71..508ffaabca 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -66,6 +66,7 @@ (define-module (gnu packages kodi) #:use-module (gnu packages samba) #:use-module (gnu packages sdl) #:use-module (gnu packages serialization) + #:use-module (gnu packages sqlite) #:use-module (gnu packages ssh) #:use-module (gnu packages swig) #:use-module (gnu packages textutils) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 261e720e2b..05f325e60d 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -62,6 +62,7 @@ (define-module (gnu packages lisp) #:use-module (gnu packages pkg-config) #:use-module (gnu packages readline) #:use-module (gnu packages sdl) + #:use-module (gnu packages sqlite) #:use-module (gnu packages tex) #:use-module (gnu packages texinfo) #:use-module (gnu packages version-control) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 2d3a83e954..e556077423 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -100,6 +100,7 @@ (define-module (gnu packages mail) #:use-module (gnu packages serialization) #:use-module (gnu packages samba) #:use-module (gnu packages screen) + #:use-module (gnu packages sqlite) #:use-module (gnu packages tcl) #:use-module (gnu packages texinfo) #:use-module (gnu packages time) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index df28ccffa5..36a181446a 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -78,6 +78,7 @@ (define-module (gnu packages messaging) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) + #:use-module (gnu packages sqlite) #:use-module (gnu packages tcl) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index bc773025a3..3fe5d06f4c 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -52,7 +52,7 @@ (define-module (gnu packages mpd) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages pulseaudio) - #:use-module (gnu packages databases) + #:use-module (gnu packages sqlite) #:use-module (gnu packages video) #:use-module (gnu packages xiph)) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 4be8259a3a..5522d94c33 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -70,7 +70,6 @@ (define-module (gnu packages music) #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages cyrus-sasl) - #:use-module (gnu packages databases) #:use-module (gnu packages datastructures) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) @@ -120,6 +119,7 @@ (define-module (gnu packages music) #:use-module (gnu packages readline) #:use-module (gnu packages rsync) #:use-module (gnu packages sdl) + #:use-module (gnu packages sqlite) #:use-module (gnu packages tcl) #:use-module (gnu packages texinfo) #:use-module (gnu packages tex) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 1a13225437..df0630219f 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -66,7 +66,6 @@ (define-module (gnu packages networking) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages curl) - #:use-module (gnu packages databases) #:use-module (gnu packages dejagnu) #:use-module (gnu packages documentation) #:use-module (gnu packages flex) @@ -94,6 +93,7 @@ (define-module (gnu packages networking) #:use-module (gnu packages qt) #:use-module (gnu packages readline) #:use-module (gnu packages serialization) + #:use-module (gnu packages sqlite) #:use-module (gnu packages ssh) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) diff --git a/gnu/packages/nfs.scm b/gnu/packages/nfs.scm index bdb36d272b..9d7acc3592 100644 --- a/gnu/packages/nfs.scm +++ b/gnu/packages/nfs.scm @@ -21,11 +21,11 @@ (define-module (gnu packages nfs) #:use-module (gnu packages) #:use-module (gnu packages linux) - #:use-module (gnu packages databases) #:use-module (gnu packages libevent) #:use-module (gnu packages kerberos) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages sqlite) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 675b031b6e..59c327d61f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -36,7 +36,6 @@ (define-module (gnu packages ocaml) #:use-module (gnu packages boost) #:use-module (gnu packages compression) #:use-module (gnu packages curl) - #:use-module (gnu packages databases) #:use-module (gnu packages emacs) #:use-module (gnu packages flex) #:use-module (gnu packages gcc) @@ -57,6 +56,7 @@ (define-module (gnu packages ocaml) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages sdl) + #:use-module (gnu packages sqlite) #:use-module (gnu packages tex) #:use-module (gnu packages texinfo) #:use-module (gnu packages time) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index edc904b6a0..10153ca062 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -66,6 +66,7 @@ (define-module (gnu packages package-management) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages serialization) + #:use-module (gnu packages sqlite) #:use-module (gnu packages ssh) #:use-module (gnu packages texinfo) #:use-module (gnu packages time) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index bead04bc7c..b243e6806f 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -49,7 +49,6 @@ (define-module (gnu packages pdf) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) - #:use-module (gnu packages databases) #:use-module (gnu packages djvu) #:use-module (gnu packages fontutils) #:use-module (gnu packages game-development) @@ -75,6 +74,7 @@ (define-module (gnu packages pdf) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages sdl) + #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 9315e40d0c..c7bb9afe29 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -37,7 +37,6 @@ (define-module (gnu packages photo) #:use-module (gnu packages boost) #:use-module (gnu packages compression) #:use-module (gnu packages curl) - #:use-module (gnu packages databases) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) @@ -58,6 +57,7 @@ (define-module (gnu packages photo) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) + #:use-module (gnu packages sqlite) #:use-module (gnu packages tex) #:use-module (gnu packages web) #:use-module (gnu packages wxwidgets) diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index a96f1c2259..2fbb37ce56 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -42,6 +42,7 @@ (define-module (gnu packages php) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages readline) + #:use-module (gnu packages sqlite) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) #:use-module (gnu packages web) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index b418011d58..44a3c322de 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -82,6 +82,7 @@ (define-module (gnu packages python) #:use-module (gnu packages libffi) #:use-module (gnu packages pkg-config) #:use-module (gnu packages readline) + #:use-module (gnu packages sqlite) #:use-module (gnu packages tcl) #:use-module (gnu packages tls) #:use-module (guix packages) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index c2f8a512fa..de5d31e4d7 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -65,6 +65,7 @@ (define-module (gnu packages qt) #:use-module (gnu packages python-xyz) #:use-module (gnu packages ruby) #:use-module (gnu packages sdl) + #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages vulkan) #:use-module (gnu packages xdisorg) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index ddc809ea48..e14d1371a3 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -44,6 +44,7 @@ (define-module (gnu packages ruby) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages ragel) + #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (guix packages) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 48b52c7da8..4f61bd1667 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -41,13 +41,13 @@ (define-module (gnu packages scheme) #:use-module (gnu packages autotools) #:use-module (gnu packages bdw-gc) #:use-module (gnu packages compression) + #:use-module (gnu packages databases) #:use-module (gnu packages libevent) #:use-module (gnu packages libunistring) #:use-module (gnu packages m4) #:use-module (gnu packages multiprecision) #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre) - #:use-module (gnu packages databases) #:use-module (gnu packages emacs) #:use-module (gnu packages ghostscript) #:use-module (gnu packages netpbm) @@ -65,6 +65,7 @@ (define-module (gnu packages scheme) #:use-module (gnu packages fontutils) #:use-module (gnu packages image) #:use-module (gnu packages xorg) + #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages gl) #:use-module (gnu packages libedit) diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm new file mode 100644 index 0000000000..5e5bbd8fb6 --- /dev/null +++ b/gnu/packages/sqlite.scm @@ -0,0 +1,125 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2013, 2015, 2018 Ludovic Courtès +;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver +;;; Copyright © 2014 Sree Harsha Totakura +;;; Copyright © 2015, 2016 Sou Bunnbu +;;; Copyright © 2016 Efraim Flashner +;;; Copyright © 2016 Ben Woodcroft +;;; Copyright © 2016 David Craven +;;; Copyright © 2016, 2017, 2018 Marius Bakke +;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2017 Jelle Licht +;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Alex Vong +;;; +;;; 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 sqlite) + #:use-module (gnu packages) + #:use-module (gnu packages readline) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (guix utils) + #:use-module (ice-9 match) + #:use-module (srfi srfi-26)) + +;;; Commentary: +;;; +;;; This module has been separated from (gnu packages databases) to reduce the +;;; number of module references for core packages. + +(define-public sqlite + (package + (name "sqlite") + (replacement sqlite-3.26.0) + (version "3.24.0") + (source (origin + (method url-fetch) + (uri (let ((numeric-version + (match (string-split version #\.) + ((first-digit other-digits ...) + (string-append first-digit + (string-pad-right + (string-concatenate + (map (cut string-pad <> 2 #\0) + other-digits)) + 6 #\0)))))) + (string-append "https://sqlite.org/2018/sqlite-autoconf-" + numeric-version ".tar.gz"))) + (sha256 + (base32 + "0jmprv2vpggzhy7ma4ynmv1jzn3pfiwzkld0kkg6hvgvqs44xlfr")))) + (build-system gnu-build-system) + (inputs `(("readline" ,readline))) + (arguments + `(#:configure-flags + ;; Add -DSQLITE_SECURE_DELETE, -DSQLITE_ENABLE_UNLOCK_NOTIFY and + ;; -DSQLITE_ENABLE_DBSTAT_VTAB to CFLAGS. GNU Icecat will refuse + ;; to use the system SQLite unless these options are enabled. + (list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE " + "-DSQLITE_ENABLE_UNLOCK_NOTIFY " + "-DSQLITE_ENABLE_DBSTAT_VTAB")))) + (home-page "https://www.sqlite.org/") + (synopsis "The SQLite database management system") + (description + "SQLite is a software library that implements a self-contained, serverless, +zero-configuration, transactional SQL database engine. SQLite is the most +widely deployed SQL database engine in the world. The source code for SQLite +is in the public domain.") + (license license:public-domain))) + +(define-public sqlite-3.26.0 + (package (inherit sqlite) + (version "3.26.0") + (source (origin + (method url-fetch) + (uri (let ((numeric-version + (match (string-split version #\.) + ((first-digit other-digits ...) + (string-append first-digit + (string-pad-right + (string-concatenate + (map (cut string-pad <> 2 #\0) + other-digits)) + 6 #\0)))))) + (string-append "https://sqlite.org/2018/sqlite-autoconf-" + numeric-version ".tar.gz"))) + (sha256 + (base32 + "0pdzszb4sp73hl36siiv3p300jvfvbcdxi2rrmkwgs6inwznmajx")))))) + +;; This is used by Tracker. +(define-public sqlite-with-fts5 + (package/inherit sqlite + (name "sqlite-with-fts5") + (arguments + (substitute-keyword-arguments (package-arguments sqlite) + ((#:configure-flags flags) + `(cons "--enable-fts5" ,flags)))))) + +;; This is used by Qt. +(define-public sqlite-with-column-metadata + (package/inherit sqlite + (name "sqlite-with-column-metadata") + (arguments + (substitute-keyword-arguments (package-arguments sqlite) + ((#:configure-flags flags) + `(list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE " + "-DSQLITE_ENABLE_UNLOCK_NOTIFY " + "-DSQLITE_ENABLE_DBSTAT_VTAB " + "-DSQLITE_ENABLE_COLUMN_METADATA"))))))) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 5b36e7f025..421e362cde 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -33,7 +33,6 @@ (define-module (gnu packages sync) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) - #:use-module (gnu packages databases) #:use-module (gnu packages golang) #:use-module (gnu packages linux) #:use-module (gnu packages lua) @@ -43,6 +42,7 @@ (define-module (gnu packages sync) #:use-module (gnu packages qt) #:use-module (gnu packages rsync) #:use-module (gnu packages selinux) + #:use-module (gnu packages sqlite) #:use-module (gnu packages tls)) (define-public owncloud-client diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index a7c685fdc1..a9ccfcd274 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -24,11 +24,11 @@ (define-module (gnu packages syndication) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages curl) - #:use-module (gnu packages databases) #:use-module (gnu packages documentation) #:use-module (gnu packages gettext) #:use-module (gnu packages ncurses) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages sqlite) #:use-module (gnu packages web) #:use-module (gnu packages xml)) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index fcdc2282d9..296c590ffd 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -89,7 +89,7 @@ (define-module (gnu packages version-control) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages rsync) - #:use-module (gnu packages databases) + #:use-module (gnu packages sqlite) #:use-module (gnu packages admin) #:use-module (gnu packages xml) #:use-module (gnu packages emacs) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 5d03fd2d7e..947c498c01 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -82,7 +82,6 @@ (define-module (gnu packages video) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) #:use-module (gnu packages curl) - #:use-module (gnu packages databases) #:use-module (gnu packages dejagnu) #:use-module (gnu packages dns) #:use-module (gnu packages docbook) @@ -132,6 +131,7 @@ (define-module (gnu packages video) #:use-module (gnu packages sdl) #:use-module (gnu packages serialization) #:use-module (gnu packages shells) + #:use-module (gnu packages sqlite) #:use-module (gnu packages ssh) #:use-module (gnu packages swig) #:use-module (gnu packages texinfo) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 390a827e40..5390291496 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -29,7 +29,6 @@ (define-module (gnu packages web-browsers) #:use-module (guix packages) #:use-module (gnu packages) #:use-module (gnu packages compression) - #:use-module (gnu packages databases) #:use-module (gnu packages documentation) #:use-module (gnu packages fltk) #:use-module (gnu packages fontutils) @@ -48,6 +47,7 @@ (define-module (gnu packages web-browsers) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages image) + #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages webkit) #:use-module (gnu packages xorg) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index f135666a7e..73cd510981 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -31,7 +31,6 @@ (define-module (gnu packages webkit) #:use-module (gnu packages) #:use-module (gnu packages base) #:use-module (gnu packages bison) - #:use-module (gnu packages databases) #:use-module (gnu packages docbook) #:use-module (gnu packages enchant) #:use-module (gnu packages flex) @@ -51,6 +50,7 @@ (define-module (gnu packages webkit) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages ruby) + #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages xml) -- cgit v1.2.3 From 255d1bbe777a824be726edeb9fd47458a3a877a9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 16 Jan 2019 14:48:47 +0100 Subject: 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 (limited to 'gnu/packages/gnome.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 @@ (define-module (gnu packages audio) #: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 @@ (define-module (gnu packages avahi) #: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 @@ (define-module (gnu packages backup) #: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 @@ (define-module (gnu packages cobol) #: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 @@ (define-module (gnu packages databases) #: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 @@ (define-public 4store 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 @@ (define-public go-gopkg.in-mgo.v2 (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 @@ (define-module (gnu packages finance) #: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 @@ (define-module (gnu packages game-development) #: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 @@ (define-module (gnu packages gnome) #: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 @@ (define-module (gnu packages guile) #: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 @@ (define-module (gnu packages ibus) #: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 @@ (define-module (gnu packages kerberos) #: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 @@ (define-module (gnu packages linux) #: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 @@ (define-module (gnu packages mail) #: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 @@ (define-module (gnu packages man) #: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 @@ (define-module (gnu packages openldap) #: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 @@ (define-module (gnu packages package-management) #: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 @@ (define-module (gnu packages php) #: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 @@ (define-module (gnu packages pulseaudio) #: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 @@ (define-module (gnu packages python) #: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 @@ (define-module (gnu packages rdf) #: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 @@ (define-module (gnu packages ruby) #: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 @@ (define-module (gnu packages sawfish) #: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) -- cgit v1.2.3 From 4b2ed6c2a3706267859fb62288b5e912743927d8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 6 Aug 2018 16:44:43 +0200 Subject: gnu: Add libdazzle. * gnu/packages/gnome.scm (libdazzle): New variable. --- gnu/packages/gnome.scm | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4a74a08cda..bf9109f680 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7400,3 +7400,50 @@ (define-public ghex hexadecimal or ASCII. It is useful for editing binary files in general.") (home-page "https://wiki.gnome.org/Apps/Ghex") (license license:gpl2))) + +(define-public libdazzle + (package + (name "libdazzle") + (version "3.28.5") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "08qdwv2flywnh6kibkyv0pnm67pk8xlmjh4yqx6hf13hyhkxkqgg")))) + (build-system meson-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-failing-test + (lambda _ + ;; Disable failing test. + (substitute* "tests/meson.build" + (("test\\('test-application") "#")) + #t)) + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a running X server. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + #t))))) + (native-inputs + `(("glib" ,glib "bin") ; glib-compile-resources + ("pkg-config" ,pkg-config) + ;; For tests + ("xorg-server" ,xorg-server))) + (inputs + `(("glib" ,glib) + ("gobject-introspection" ,gobject-introspection) + ("gtk+" ,gtk+) + ("vala" ,vala))) + (home-page "https://gitlab.gnome.org/GNOME/libdazzle") + (synopsis "Companion library to GObject and Gtk+") + (description "The libdazzle library is a companion library to GObject and +Gtk+. It provides various features that the authors wish were in the +underlying library but cannot for various reasons. In most cases, they are +wildly out of scope for those libraries. In other cases, they are not quite +generic enough to work for everyone.") + (license license:gpl3+))) -- cgit v1.2.3