[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into staging
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into staging |
|
Date: |
Sat, 7 Nov 2020 15:51:01 -0500 (EST) |
mbakke pushed a commit to branch staging
in repository guix.
commit 32787d652460871a79f99b63230f92759e2e0de2
Merge: 052939c c2396ce
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Nov 7 21:33:32 2020 +0100
Merge branch 'master' into staging
Conflicts:
gnu/local.mk
gnu/packages/gdb.scm
gnu/packages/lisp-xyz.scm
gnu/packages/web-browsers.scm
.dir-locals.el | 23 +-
.gitignore | 4 +
HACKING | 2 +-
Makefile.am | 15 +-
README | 21 +-
build-aux/update-guix-package.scm | 98 +-
configure.ac | 5 +
doc/build.scm | 38 +-
doc/contributing.texi | 57 +-
doc/guix.texi | 1360 +-
doc/local.mk | 18 +-
etc/news.scm | 161 +
gnu/bootloader/grub.scm | 72 +-
gnu/build/bootloader.scm | 7 +-
gnu/build/file-systems.scm | 105 +-
gnu/build/image.scm | 10 +-
gnu/build/linux-boot.scm | 59 +
gnu/build/shepherd.scm | 16 +-
gnu/installer/newt.scm | 1 +
gnu/installer/newt/ethernet.scm | 2 +-
gnu/installer/newt/final.scm | 19 +-
gnu/installer/newt/network.scm | 2 +-
gnu/installer/newt/page.scm | 11 +-
gnu/installer/newt/parameters.scm | 4 +-
gnu/installer/newt/partition.scm | 20 +-
gnu/installer/newt/services.scm | 3 +-
gnu/installer/newt/welcome.scm | 8 +-
gnu/installer/newt/wifi.scm | 3 +-
gnu/installer/parted.scm | 58 +-
gnu/installer/steps.scm | 2 -
gnu/installer/tests.scm | 31 +-
gnu/local.mk | 30 +-
gnu/machine/ssh.scm | 3 +
gnu/packages/acl.scm | 3 +-
gnu/packages/admin.scm | 132 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/audio.scm | 22 +-
.../linux-libre/{5.8-arm.conf => 5.9-arm.conf} | 145 +-
.../linux-libre/{5.8-arm64.conf => 5.9-arm64.conf} | 165 +-
.../linux-libre/{5.8-i686.conf => 5.9-i686.conf} | 139 +-
.../{5.8-x86_64.conf => 5.9-x86_64.conf} | 130 +-
gnu/packages/aux-files/run-in-namespace.c | 54 +-
gnu/packages/avr.scm | 67 +-
gnu/packages/backup.scm | 10 +-
gnu/packages/bash.scm | 43 +-
gnu/packages/benchmark.scm | 21 +-
gnu/packages/bioconductor.scm | 26 +
gnu/packages/bioinformatics.scm | 21 +-
gnu/packages/bootloaders.scm | 25 +-
gnu/packages/calendar.scm | 53 +-
gnu/packages/check.scm | 4 +-
gnu/packages/chromium.scm | 49 +-
gnu/packages/code.scm | 177 +-
gnu/packages/cpp.scm | 10 +-
gnu/packages/cran.scm | 325 +-
gnu/packages/crates-io.scm | 88 +-
gnu/packages/crypto.scm | 45 +-
gnu/packages/databases.scm | 182 +
gnu/packages/dictionaries.scm | 10 +-
gnu/packages/diffoscope.scm | 42 +-
gnu/packages/disk.scm | 17 +-
gnu/packages/django.scm | 18 +-
gnu/packages/dns.scm | 30 +-
gnu/packages/education.scm | 10 +-
gnu/packages/emacs-xyz.scm | 875 +-
gnu/packages/embedded.scm | 176 +-
gnu/packages/emulators.scm | 8 +-
gnu/packages/file-systems.scm | 21 +-
gnu/packages/finance.scm | 194 +-
gnu/packages/fonts.scm | 55 +
gnu/packages/fontutils.scm | 46 +-
gnu/packages/freedesktop.scm | 87 +
gnu/packages/games.scm | 152 +-
gnu/packages/gdb.scm | 38 +-
gnu/packages/geo.scm | 5 +-
gnu/packages/gettext.scm | 15 +-
gnu/packages/gimp.scm | 10 +-
gnu/packages/glib.scm | 42 +
gnu/packages/gnome-xyz.scm | 6 +-
gnu/packages/gnome.scm | 99 +-
gnu/packages/gnuzilla.scm | 20 +-
gnu/packages/golang.scm | 224 +-
gnu/packages/gps.scm | 13 +-
gnu/packages/gtk.scm | 6 +
gnu/packages/guile-xyz.scm | 149 +-
gnu/packages/guile.scm | 16 +-
gnu/packages/hardware.scm | 21 +-
gnu/packages/haskell-apps.scm | 6 +-
gnu/packages/haskell-xyz.scm | 580 +-
gnu/packages/image-viewers.scm | 21 +-
gnu/packages/inkscape.scm | 21 +-
gnu/packages/java.scm | 30 +-
gnu/packages/kde-frameworks.scm | 6 +-
gnu/packages/kde-internet.scm | 4 +-
gnu/packages/kde-plasma.scm | 35 +-
gnu/packages/kde.scm | 56 +-
gnu/packages/kodi.scm | 4 +-
gnu/packages/language.scm | 4 +-
gnu/packages/less.scm | 6 +-
gnu/packages/libreoffice.scm | 5 +-
gnu/packages/linux.scm | 130 +-
gnu/packages/lisp-xyz.scm | 54 +-
gnu/packages/lisp.scm | 4 +-
gnu/packages/llvm.scm | 59 +
gnu/packages/lxde.scm | 4 +-
gnu/packages/lxqt.scm | 20 +-
gnu/packages/mail.scm | 58 +-
gnu/packages/man.scm | 4 +-
gnu/packages/maths.scm | 27 +-
gnu/packages/matrix.scm | 5 +-
gnu/packages/messaging.scm | 259 +-
gnu/packages/monitoring.scm | 4 +-
gnu/packages/mp3.scm | 5 +-
gnu/packages/mpd.scm | 99 +-
gnu/packages/mpi.scm | 7 +-
gnu/packages/mtools.scm | 4 +-
gnu/packages/music.scm | 48 +-
gnu/packages/networking.scm | 166 +-
gnu/packages/nvi.scm | 38 +-
gnu/packages/ocaml.scm | 101 +-
gnu/packages/package-management.scm | 199 +-
gnu/packages/pantheon.scm | 4 +-
gnu/packages/parallel.scm | 21 +-
gnu/packages/password-utils.scm | 14 +-
.../patches/benchmark-unbundle-googletest.patch | 69 -
gnu/packages/patches/bsd-games-2.17-64bit.patch | 43 +
.../patches/bsd-games-add-configure-config.patch | 22 +
gnu/packages/patches/bsd-games-add-wrapper.patch | 251 +
.../patches/bsd-games-bad-ntohl-cast.patch | 22 +
.../bsd-games-dont-install-empty-files.patch | 87 +
gnu/packages/patches/bsd-games-gamescreen.h.patch | 14 +
gnu/packages/patches/bsd-games-getline.patch | 194 +
gnu/packages/patches/bsd-games-null-check.patch | 24 +
.../patches/bsd-games-number.c-and-test.patch | 183 +
.../bsd-games-prevent-name-collisions.patch | 13 +
gnu/packages/patches/bsd-games-stdio.h.patch | 14 +
gnu/packages/patches/farstream-make.patch | 39 +
gnu/packages/patches/gdb-hurd.patch | 69 -
gnu/packages/patches/icecat-makeicecat.patch | 4 +-
.../kpackage-fix-KF5PackageMacros.cmake.patch | 25 +
gnu/packages/patches/netcdf-date-time.patch | 6 +-
gnu/packages/patches/netcdf-tst_h_par.patch | 21 -
...ml-bisect-fix-camlp4-in-another-directory.patch | 283 -
gnu/packages/patches/openocd-nrf52.patch | 827 -
...lasma-framework-fix-KF5PlasmaMacros.cmake.patch | 25 +
... python-robotframework-source-date-epoch.patch} | 0
gnu/packages/patches/rcs-5.10.0-no-stdin.patch | 57 +
gnu/packages/patches/rcs-5.9.4-noreturn.patch | 94 -
.../patches/sbcl-geco-fix-organism-class.patch | 13 +
.../patches/u-boot-riscv64-fix-extlinux.patch | 6 +-
.../ungoogled-chromium-extension-search-path.patch | 28 +
gnu/packages/patches/yggdrasil-extra-config.patch | 86 +
gnu/packages/patchutils.scm | 54 +
gnu/packages/pdf.scm | 8 +-
gnu/packages/photo.scm | 4 +-
gnu/packages/php.scm | 15 +-
gnu/packages/prolog.scm | 4 +-
gnu/packages/protobuf.scm | 2 +-
gnu/packages/python-check.scm | 2 +-
gnu/packages/python-web.scm | 38 +-
gnu/packages/python-xyz.scm | 223 +-
gnu/packages/python.scm | 34 +-
gnu/packages/radio.scm | 14 +-
gnu/packages/raspberry-pi.scm | 237 +
gnu/packages/ruby.scm | 37 +-
gnu/packages/samba.scm | 63 +-
gnu/packages/scheme.scm | 4 +-
gnu/packages/shells.scm | 8 +-
gnu/packages/skribilo.scm | 24 +-
gnu/packages/sphinx.scm | 5 +-
gnu/packages/spice.scm | 1 +
gnu/packages/ssh.scm | 43 +-
gnu/packages/statistics.scm | 126 +-
gnu/packages/telephony.scm | 4 +-
gnu/packages/terminals.scm | 6 +
gnu/packages/tex.scm | 59 +
gnu/packages/text-editors.scm | 4 +-
gnu/packages/textutils.scm | 33 +
gnu/packages/time.scm | 4 +-
gnu/packages/tls.scm | 8 +-
gnu/packages/tmux.scm | 4 +-
gnu/packages/version-control.scm | 26 +-
gnu/packages/video.scm | 82 +-
gnu/packages/vim.scm | 9 +-
gnu/packages/virtualization.scm | 12 +-
gnu/packages/visidata.scm | 40 +-
gnu/packages/vpn.scm | 4 +-
gnu/packages/web-browsers.scm | 17 +-
gnu/packages/web.scm | 63 +-
gnu/packages/webkit.scm | 4 +-
gnu/packages/wm.scm | 14 +-
gnu/packages/xfce.scm | 12 +-
gnu/packages/zile.scm | 6 +-
gnu/services/base.scm | 86 +-
gnu/services/databases.scm | 22 +-
gnu/services/desktop.scm | 36 +
gnu/services/dns.scm | 2 +-
gnu/services/ganeti.scm | 2 +-
gnu/services/guix.scm | 21 +-
gnu/services/monitoring.scm | 7 +-
gnu/services/networking.scm | 117 +-
gnu/services/virtualization.scm | 11 +-
gnu/services/web.scm | 75 +-
gnu/system.scm | 29 +-
gnu/system/examples/yggdrasil.tmpl | 60 +
gnu/system/image.scm | 24 +-
gnu/system/uuid.scm | 8 +-
gnu/system/vm.scm | 5 +-
gnu/tests/base.scm | 2 +-
gnu/tests/databases.scm | 4 +-
gnu/tests/guix.scm | 1 +
gnu/tests/install.scm | 18 +-
gnu/tests/mail.scm | 3 +-
gnu/tests/monitoring.scm | 4 +-
gnu/tests/reconfigure.scm | 4 +-
gnu/tests/web.scm | 4 +-
guix/build/maven-build-system.scm | 3 +-
guix/build/maven/pom.scm | 12 +-
guix/download.scm | 14 +-
guix/gexp.scm | 61 +-
guix/git.scm | 142 +-
guix/graph.scm | 4 +-
guix/import/crate.scm | 2 +-
guix/import/print.scm | 11 +-
guix/import/stackage.scm | 21 +-
guix/packages.scm | 63 +-
guix/profiles.scm | 42 +-
guix/scripts/build.scm | 518 +-
guix/scripts/environment.scm | 5 +-
guix/scripts/graph.scm | 18 +-
guix/scripts/install.scm | 3 +-
guix/scripts/lint.scm | 60 +-
guix/scripts/offload.scm | 28 +-
guix/scripts/pack.scm | 51 +-
guix/scripts/package.scm | 7 +-
guix/scripts/publish.scm | 106 +-
guix/scripts/substitute.scm | 2 +-
guix/scripts/system.scm | 3 +
guix/scripts/system/reconfigure.scm | 17 +-
guix/scripts/upgrade.scm | 3 +-
guix/tests.scm | 10 +-
guix/transformations.scm | 620 +
m4/guix.m4 | 22 +
nix/local.mk | 1 +
po/doc/guix-cookbook.de.po | 2678 +-
po/doc/guix-manual.de.po | 22219 +++++++------
po/doc/guix-manual.es.po | 21881 +++++++------
po/doc/guix-manual.fr.po | 30826 +++++++++++--------
po/doc/guix-manual.ru.po | 30126 +++++++++++-------
po/guix/Makevars | 1 +
po/guix/POTFILES.in | 1 +
po/guix/de.po | 679 +-
po/guix/es.po | 698 +-
po/guix/fr.po | 670 +-
po/guix/sv.po | 4149 ++-
po/guix/ta.po | 3049 +-
po/packages/fr.po | 7385 +++--
tests/boot-parameters.scm | 23 +-
tests/gexp.scm | 14 +-
tests/graph.scm | 2 +-
tests/guix-build.sh | 6 +
tests/guix-pack-relocatable.sh | 108 +
tests/packages.scm | 43 +
tests/publish.scm | 83 +-
tests/{scripts-build.scm => transformations.scm} | 270 +-
265 files changed, 84038 insertions(+), 55868 deletions(-)
diff --cc gnu/local.mk
index 04f5773,3a8f1e3..697863a
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1568,6 -1583,8 +1579,7 @@@ dist_patch_DATA =
%D%/packages/patches/rust-reproducible-builds.patch \
%D%/packages/patches/rust-openssl-sys-no-vendor.patch \
%D%/packages/patches/rxvt-unicode-escape-sequences.patch \
+ %D%/packages/patches/sbcl-geco-fix-organism-class.patch \
- %D%/packages/patches/sbcl-graph-asdf-definitions.patch \
%D%/packages/patches/scalapack-blacs-mpi-deprecations.patch \
%D%/packages/patches/scheme48-tests.patch \
%D%/packages/patches/scotch-build-parallelism.patch \
diff --cc gnu/packages/gdb.scm
index 828e495,c01c65c..79fc49f
--- a/gnu/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@@ -40,10 -40,10 +40,10 @@@
#:use-module (guix build-system gnu)
#:use-module (srfi srfi-1))
- (define-public gdb
-(define-public gdb-9.1
++(define-public gdb-9.2
(package
(name "gdb")
- (version "9.1")
+ (version "9.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gdb/gdb-"
@@@ -139,7 -137,7 +132,7 @@@ written in C, C++, Ada, Objective-C, Pa
;; <https://bugs.gnu.org/37810>.
(define-public gdb-8.2
(package
- (inherit gdb)
- (inherit gdb-9.1)
++ (inherit gdb-9.2)
(version "8.2.1")
(source (origin
(method url-fetch)
@@@ -148,3 -146,30 +141,30 @@@
(sha256
(base32
"00i27xqawjv282a07i73lp1l02n0a3ywzhykma75qg500wll6sha"))))))
+
+ (define-public gdb
+ ;; This is the fixed version that packages depend on. Update it rarely
+ ;; enough to avoid massive rebuilds.
- gdb-9.1)
++ gdb-9.2)
+
+ (define-public gdb-10
+ (package
+ (inherit gdb)
+ (version "10.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/gdb/gdb-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1h32dckz1y8fnyxh22iyw8h3hnhxr79v1ng85px3ljn1xv71wbzq"))))
+ (inputs
+ `(("guile" ,guile-3.0)
+ ,@(alist-delete "guile" (package-inputs gdb))))))
+
+ (define-public gdb-minimal
+ (package/inherit
+ gdb-10
+ (name "gdb-minimal")
+ (inputs (fold alist-delete (package-inputs gdb)
+ '("libxml2" "ncurses" "python-wrapper"
"source-highlight")))))
diff --cc gnu/packages/lisp-xyz.scm
index 1f00069,fb85416..ba0bad2
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@@ -5338,35 -6419,33 +5338,34 @@@ various string metrics in Common Lisp
(define-public cl-mk-string-metrics
(sbcl-package->cl-source-package sbcl-mk-string-metrics))
+(define-public ecl-mk-string-metrics
+ (sbcl-package->ecl-package sbcl-mk-string-metrics))
+
(define-public sbcl-cl-str
- (let ((commit "eb480f283e28802d67b35bf916506701152f9a2a"))
- (package
- (name "sbcl-cl-str")
- (version (git-version "0.17" "1" commit))
- (home-page "https://github.com/vindarel/cl-str";)
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url home-page)
- (commit commit)))
- (sha256
- (base32
"1hpq5m8zjjnzns370zy27z2vcm1p8n2ka5ij2x67gyc9amz9vla0"))
- (file-name (git-file-name name version))))
- (build-system asdf-build-system/sbcl)
- (inputs
- `(("cl-ppcre" ,sbcl-cl-ppcre)
- ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode)
- ("cl-change-case" ,sbcl-cl-change-case)))
- (native-inputs
- `(("prove" ,sbcl-prove)))
- (arguments
- `(#:asd-systems '("str")
- #:test-asd-file "str.test.asd"))
- (synopsis "Modern, consistent and terse Common Lisp string manipulation
library")
- (description "A modern and consistent Common Lisp string manipulation
+ (package
+ (name "sbcl-cl-str")
+ (version "0.19")
+ (home-page "https://github.com/vindarel/cl-str";)
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url home-page)
+ (commit version)))
+ (sha256
+ (base32
"1jyza2jhn7w6fl4w87pv0m87z5ia48m6dqw12k0mdh7l3mgjq839"))
+ (file-name (git-file-name name version))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("cl-ppcre" ,sbcl-cl-ppcre)
+ ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode)
+ ("cl-change-case" ,sbcl-cl-change-case)))
+ (native-inputs
- `(("prove" ,sbcl-prove)
- ("prove-asdf" ,sbcl-prove-asdf)))
++ `(("prove" ,sbcl-prove)))
+ (arguments
- `(#:asd-file "str.asd"
- #:asd-system-name "str"
++ `(#:asd-systems '("str")
+ #:test-asd-file "str.test.asd"))
+ (synopsis "Modern, consistent and terse Common Lisp string manipulation
library")
+ (description "A modern and consistent Common Lisp string manipulation
library that focuses on modernity, simplicity and discoverability:
@code{(str:trim s)} instead of @code{(string-trim '(#\\Space ...) s)}), or
@code{str:concat strings} instead of an unusual format construct; one
diff --cc gnu/packages/web-browsers.scm
index 3ea4f7f,eb49a8f..b2209cb
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@@ -534,42 -536,47 +536,44 @@@ driven and does not detract you from yo
`(("prove" ,sbcl-prove)
("sbcl" ,sbcl)))
(inputs
- ;; We need to avoid sbcl-* inputs (sbcl-cl-cffi-gtk in particular) as
they
- ;; seem to cause Nyxt to hang into a hogging process in about 10 minutes.
- ;; Probably an issue between CFFI and how we build SBCL packages.
- ;; See https://github.com/atlas-engineer/nyxt/issues/680.
- `(("alexandria" ,cl-alexandria)
- ("bordeaux-threads" ,cl-bordeaux-threads)
- ("cl-chanl" ,cl-chanl)
- ("cl-containers" ,cl-containers)
- ("cl-css" ,cl-css)
- ("cl-json" ,cl-json)
- ("cl-markup" ,cl-markup)
- ("cl-ppcre" ,cl-ppcre)
- ("cl-prevalence" ,cl-prevalence)
- ("closer-mop" ,cl-closer-mop)
- ("cluffer" ,cl-cluffer)
- ("dexador" ,cl-dexador)
- ("enchant" ,cl-enchant)
- ("fset" ,cl-fset)
- ("hu.dwim.defclass-star" ,cl-hu.dwim.defclass-star)
- ("iolib" ,cl-iolib)
- ("local-time" ,cl-local-time)
- ("log4cl" ,cl-log4cl)
- ("mk-string-metrics" ,cl-mk-string-metrics)
- ("moptilities" ,cl-moptilities)
- ("osicat" ,sbcl-osicat) ; SBCL version needed for libosicat.so.
- ("parenscript" ,cl-parenscript)
- ("plump" ,cl-plump)
- ("quri" ,cl-quri)
- ("serapeum" ,cl-serapeum)
- ("str" ,cl-str)
- ("swank" ,cl-slime-swank)
- ("trivia" ,cl-trivia)
- ("trivial-clipboard" ,cl-trivial-clipboard)
- ("trivial-features" ,cl-trivial-features)
- ("trivial-package-local-nicknames" ,cl-trivial-package-local-nicknames)
- ("trivial-types" ,cl-trivial-types)
- ("unix-opts" ,cl-unix-opts)
- ("usocket" ,cl-usocket)
+ `(("alexandria" ,sbcl-alexandria)
+ ("bordeaux-threads" ,sbcl-bordeaux-threads)
++ ("cl-chanl" ,sbcl-chanl)
+ ("cl-containers" ,sbcl-cl-containers)
+ ("cl-css" ,sbcl-cl-css)
+ ("cl-json" ,sbcl-cl-json)
+ ("cl-markup" ,sbcl-cl-markup)
+ ("cl-ppcre" ,sbcl-cl-ppcre)
+ ("cl-prevalence" ,sbcl-cl-prevalence)
+ ("closer-mop" ,sbcl-closer-mop)
+ ("cluffer" ,sbcl-cluffer)
+ ("dexador" ,sbcl-dexador)
+ ("enchant" ,sbcl-enchant)
+ ("fset" ,sbcl-fset)
+ ("hu.dwim.defclass-star" ,sbcl-hu.dwim.defclass-star)
+ ("iolib" ,sbcl-iolib)
+ ("local-time" ,sbcl-local-time)
+ ("log4cl" ,sbcl-log4cl)
+ ("lparallel" ,sbcl-lparallel)
+ ("mk-string-metrics" ,sbcl-mk-string-metrics)
+ ("moptilities" ,sbcl-moptilities)
+ ("osicat" ,sbcl-osicat)
+ ("parenscript" ,sbcl-parenscript)
+ ("plump" ,sbcl-plump)
+ ("quri" ,sbcl-quri)
+ ("serapeum" ,sbcl-serapeum)
+ ("str" ,sbcl-cl-str)
+ ("swank" ,sbcl-slime-swank)
+ ("trivia" ,sbcl-trivia)
+ ("trivial-clipboard" ,sbcl-trivial-clipboard)
+ ("trivial-features" ,sbcl-trivial-features)
+ ("trivial-package-local-nicknames"
,sbcl-trivial-package-local-nicknames)
+ ("trivial-types" ,sbcl-trivial-types)
+ ("unix-opts" ,sbcl-unix-opts)
++ ("usocket" ,sbcl-usocket)
;; WebKitGTK deps
- ("cl-cffi-gtk" ,cl-cffi-gtk)
- ("cl-webkit" ,cl-webkit)
+ ("cl-cffi-gtk" ,sbcl-cl-cffi-gtk)
+ ("cl-webkit" ,sbcl-cl-webkit)
("glib-networking" ,glib-networking)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)))
(synopsis "Extensible web-browser in Common Lisp")