diff options
50 files changed, 179 insertions, 115 deletions
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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ browse and edit the contents, add and delete entries, all while tracking your 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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 <ludo@gnu.org> +;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in> +;;; Copyright © 2015, 2016 Sou Bunnbu <iyzsong@gmail.com> +;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016 Ben Woodcroft <donttrustben@gmail.com> +;;; Copyright © 2016 David Craven <david@craven.ch> +;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org> +;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> +;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com> +;;; +;;; 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 <http://www.gnu.org/licenses/>. + +(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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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 @@ #: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) |