diff options
Diffstat (limited to 'gnu/packages/emacs-xyz.scm')
| -rw-r--r-- | gnu/packages/emacs-xyz.scm | 79 |
1 files changed, 42 insertions, 37 deletions
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b6cdbf5eab..7c8af093fc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com> -;;; Copyright © 2013-2022 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013-2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019 Alex Kost <alezost@gmail.com> ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> @@ -17854,7 +17854,9 @@ conflicts.") version ".tar")) (sha256 (base32 - "1fp5mzl63sh0h3ws4l5p4qgvi7ny8a3fj6k4dhqa98xgw2bx03v7")))) + "1fp5mzl63sh0h3ws4l5p4qgvi7ny8a3fj6k4dhqa98xgw2bx03v7")) + (patches + (search-patches "emacs-xelb-ignore-length-element.patch")))) (build-system emacs-build-system) ;; The following functions and variables needed by emacs-xelb are ;; not included in emacs-minimal: @@ -21264,42 +21266,45 @@ object @code{nil} corresponds 1:1 with @code{NULL} in the database.") (license license:gpl3+)))) (define-public emacs-emacsql-sqlite3 - (package - (name "emacs-emacsql-sqlite3") - (version "1.0.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/cireu/emacsql-sqlite3") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1jzvvsvi8jm2ws3y49nmpmwd3zlvf8j83rl2vwizd1aplwwdnmd6")))) - (build-system emacs-build-system) - (arguments - `(#:tests? #t - #:test-command '("emacs" "-Q" "--batch" "-L" "." - "--load" "emacsql-sqlite3-test.el" - "-f" "ert-run-tests-batch-and-exit") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'embed-path-to-sqlite3 - (lambda _ - (substitute* "emacsql-sqlite3.el" - (("\\(executable-find \"sqlite3\"\\)") - (string-append "\"" (which "sqlite3") "\"")))))))) - (native-inputs - (list emacs-ert-runner)) - (inputs - (list sqlite)) - (propagated-inputs - (list emacs-emacsql)) - (home-page "https://github.com/cireu/emacsql-sqlite3") - (synopsis "EmacSQL backend for SQLite") - (description "This is yet another EmacSQL backend for SQLite which uses + ;; This commit contains changes necessary for Sqlite 3.38+. + (let ((commit "2113618732665f2112cb932a66c0e89c404d8777") + (revision "1")) + (package + (name "emacs-emacsql-sqlite3") + (version (git-version "1.0.2" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cireu/emacsql-sqlite3") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0r8svrd0d4cflx8a8gkynnhafcpv3ksn9rds8dhyx5yibximbzsw")))) + (build-system emacs-build-system) + (arguments + `(#:tests? #t + #:test-command '("emacs" "-Q" "--batch" "-L" "." + "--load" "emacsql-sqlite3-test.el" + "-f" "ert-run-tests-batch-and-exit") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'embed-path-to-sqlite3 + (lambda _ + (substitute* "emacsql-sqlite3.el" + (("\\(executable-find \"sqlite3\"\\)") + (string-append "\"" (which "sqlite3") "\"")))))))) + (native-inputs + (list emacs-ert-runner)) + (inputs + (list sqlite)) + (propagated-inputs + (list emacs-emacsql)) + (home-page "https://github.com/cireu/emacsql-sqlite3") + (synopsis "EmacSQL backend for SQLite") + (description "This is yet another EmacSQL backend for SQLite which uses official @command{sqlite3} executable to access SQL database.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-closql (package |