[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into staging
|
From: |
guix-commits |
|
Subject: |
01/02: Merge branch 'master' into staging |
|
Date: |
Mon, 5 Oct 2020 13:01:51 -0400 (EDT) |
glv pushed a commit to branch staging
in repository guix.
commit 87c079d9b55afda249ddc1b11798a62547a2cbb6
Merge: de96ed1 3699ed6
Author: Guillaume Le Vaillant <glv@posteo.net>
AuthorDate: Mon Oct 5 14:17:25 2020 +0200
Merge branch 'master' into staging
.dir-locals.el | 6 +-
.gitignore | 1 +
Makefile.am | 6 +-
build-aux/cuirass/hurd-manifest.scm | 74 +
build-aux/hydra/guix-modular.scm | 30 +-
doc/contributing.texi | 4 +-
doc/guix.texi | 2009 +++++----
etc/completion/bash/guix | 7 +-
etc/guix-install.sh | 20 +-
etc/news.scm | 174 +
etc/openrc/guix-daemon.in | 28 +
gnu/bootloader/grub.scm | 135 +-
gnu/bootloader/u-boot.scm | 69 +-
gnu/build/bootloader.scm | 15 +-
gnu/build/image.scm | 16 +-
gnu/build/linux-container.scm | 3 +-
gnu/build/secret-service.scm | 121 +-
gnu/build/shepherd.scm | 16 +-
gnu/ci.scm | 100 +-
gnu/image.scm | 29 +-
gnu/installer.scm | 2 +-
gnu/installer/connman.scm | 2 +-
gnu/installer/newt.scm | 2 +-
gnu/installer/newt/locale.scm | 2 +-
gnu/installer/newt/partition.scm | 4 +-
gnu/installer/parted.scm | 4 +-
gnu/installer/steps.scm | 2 +-
gnu/local.mk | 16 +-
gnu/packages/abduco.scm | 3 +-
gnu/packages/accessibility.scm | 5 +-
gnu/packages/admin.scm | 31 +-
gnu/packages/algebra.scm | 33 +-
gnu/packages/antivirus.scm | 4 +-
gnu/packages/astronomy.scm | 6 +-
gnu/packages/audio.scm | 111 +-
gnu/packages/axoloti.scm | 4 +-
gnu/packages/backup.scm | 2 +-
gnu/packages/benchmark.scm | 4 +-
gnu/packages/bioconductor.scm | 503 ++-
gnu/packages/bioinformatics.scm | 347 +-
gnu/packages/bootloaders.scm | 4 +-
gnu/packages/build-tools.scm | 19 +-
gnu/packages/ccache.scm | 4 +-
gnu/packages/check.scm | 8 +-
gnu/packages/chicken.scm | 2 +-
gnu/packages/ci.scm | 31 +-
gnu/packages/code.scm | 95 +-
gnu/packages/commencement.scm | 16 +-
gnu/packages/compression.scm | 34 +-
gnu/packages/conky.scm | 2 +-
gnu/packages/coq.scm | 42 +-
gnu/packages/cpp.scm | 26 +-
gnu/packages/cran.scm | 249 +-
gnu/packages/crates-graphics.scm | 2374 ++++++++++
gnu/packages/crates-gtk.scm | 667 +++
gnu/packages/crates-io.scm | 4520 ++++++--------------
gnu/packages/crypto.scm | 8 +-
gnu/packages/cryptsetup.scm | 6 +-
gnu/packages/cups.scm | 56 +-
gnu/packages/databases.scm | 167 +-
gnu/packages/datastructures.scm | 12 +-
gnu/packages/dico.scm | 6 +-
gnu/packages/dictionaries.scm | 4 +-
gnu/packages/diffoscope.scm | 2 +-
gnu/packages/disk.scm | 2 +-
gnu/packages/django.scm | 840 ++--
gnu/packages/dns.scm | 77 +-
gnu/packages/docker.scm | 23 +-
gnu/packages/documentation.scm | 2 +-
gnu/packages/easyrpg.scm | 4 +-
gnu/packages/ebook.scm | 154 +-
gnu/packages/education.scm | 8 +-
gnu/packages/elixir.scm | 6 +-
gnu/packages/emacs-xyz.scm | 730 ++--
gnu/packages/emacs.scm | 42 +-
gnu/packages/emulators.scm | 34 +-
gnu/packages/engineering.scm | 32 +-
gnu/packages/enlightenment.scm | 25 +-
gnu/packages/file-systems.scm | 25 +-
gnu/packages/finance.scm | 171 +-
gnu/packages/fonts.scm | 39 +-
gnu/packages/fontutils.scm | 16 +-
gnu/packages/freedesktop.scm | 74 +-
gnu/packages/game-development.scm | 13 +-
gnu/packages/games.scm | 180 +-
gnu/packages/gcc.scm | 20 +-
gnu/packages/geo.scm | 25 +-
gnu/packages/gettext.scm | 8 +-
gnu/packages/glib.scm | 21 +-
gnu/packages/gnome-xyz.scm | 2 +-
gnu/packages/gnome.scm | 491 ++-
gnu/packages/gnu-pw-mgr.scm | 12 +-
gnu/packages/gnucash.scm | 2 +-
gnu/packages/gnuzilla.scm | 362 +-
gnu/packages/golang.scm | 66 +-
gnu/packages/gps.scm | 4 +-
gnu/packages/graph.scm | 28 -
gnu/packages/graphics.scm | 36 +-
gnu/packages/groff.scm | 20 +-
gnu/packages/gstreamer.scm | 6 +-
gnu/packages/gtk.scm | 2 +-
gnu/packages/guile-xyz.scm | 23 +-
gnu/packages/guile.scm | 10 +-
gnu/packages/haskell-apps.scm | 4 +-
gnu/packages/haskell-check.scm | 2 +-
gnu/packages/haskell-web.scm | 2 +-
gnu/packages/haskell-xyz.scm | 4 +-
gnu/packages/hyperledger.scm | 2 +-
gnu/packages/ibus.scm | 6 +-
gnu/packages/image-processing.scm | 51 +-
gnu/packages/image-viewers.scm | 15 +-
gnu/packages/image.scm | 39 +-
gnu/packages/inkscape.scm | 5 +-
gnu/packages/java.scm | 244 +-
gnu/packages/javascript.scm | 31 +
gnu/packages/kde-frameworks.scm | 2 +-
gnu/packages/kde-internet.scm | 10 +-
gnu/packages/kde-utils.scm | 10 +-
gnu/packages/kde.scm | 27 +-
gnu/packages/language.scm | 36 +-
gnu/packages/libreoffice.scm | 10 +-
gnu/packages/linphone.scm | 2 +-
gnu/packages/linux.scm | 146 +-
gnu/packages/lisp-xyz.scm | 89 +-
gnu/packages/machine-learning.scm | 18 +-
gnu/packages/mail.scm | 171 +-
gnu/packages/maths.scm | 15 +-
gnu/packages/maven.scm | 33 +-
gnu/packages/mercury.scm | 2 +-
gnu/packages/mes.scm | 28 +-
gnu/packages/messaging.scm | 144 +-
gnu/packages/monitoring.scm | 39 +-
gnu/packages/mpd.scm | 18 +-
gnu/packages/mpi.scm | 10 +-
gnu/packages/music.scm | 242 +-
gnu/packages/networking.scm | 40 +-
gnu/packages/nfs.scm | 3 +-
gnu/packages/nss.scm | 92 +
gnu/packages/ntp.scm | 4 +-
gnu/packages/ocaml.scm | 11 +-
gnu/packages/openldap.scm | 4 +-
gnu/packages/package-management.scm | 17 +-
.../patches/clamav-system-tomsfastmath.patch | 53 +-
gnu/packages/patches/fplll-std-fenv.patch | 18 +
.../patches/gnome-settings-daemon-gc.patch | 43 +
.../patches/grim-revert-output-rotation.patch | 27 +
gnu/packages/patches/hplip-fix-bug-1898438.patch | 19 +
gnu/packages/patches/icecat-makeicecat.patch | 14 +-
.../java-antlr4-Add-standalone-generator.patch | 52 +
.../patches/java-antlr4-fix-code-too-large.java | 90 +
.../konversation-Fix-build-with-Qt-5.11.patch | 24 -
gnu/packages/patches/liblouisutdml-fix-tests.patch | 33 -
.../mailutils-fix-uninitialized-variable.patch | 26 +
gnu/packages/patches/nss-3.56-pkgconfig.patch | 228 +
.../patches/picard-fix-id3-rename-test.patch | 11 +
gnu/packages/patches/qemu-build-info-manual.patch | 139 +
.../patches/samba-fix-fcntl-hint-detection.patch | 55 +
gnu/packages/patchutils.scm | 19 +-
gnu/packages/perl-check.scm | 5 +-
gnu/packages/perl.scm | 6 +-
gnu/packages/php.scm | 10 +-
gnu/packages/pretty-print.scm | 19 +-
gnu/packages/prolog.scm | 2 +-
gnu/packages/protobuf.scm | 11 +-
gnu/packages/pulseaudio.scm | 37 +
gnu/packages/python-check.scm | 47 +-
gnu/packages/python-crypto.scm | 2 +-
gnu/packages/python-web.scm | 184 +-
gnu/packages/python-xyz.scm | 273 +-
gnu/packages/python.scm | 9 +-
gnu/packages/radio.scm | 6 +-
gnu/packages/rdesktop.scm | 24 +-
gnu/packages/rdf.scm | 10 +-
gnu/packages/ruby.scm | 14 +-
gnu/packages/rust-apps.scm | 3 +-
gnu/packages/rust.scm | 6 +-
gnu/packages/sagemath.scm | 2 +-
gnu/packages/samba.scm | 7 +-
gnu/packages/shells.scm | 18 +-
gnu/packages/skarnet.scm | 10 +-
gnu/packages/spice.scm | 3 -
gnu/packages/ssh.scm | 48 +-
gnu/packages/statistics.scm | 200 +-
gnu/packages/suckless.scm | 4 +-
gnu/packages/syndication.scm | 2 +-
gnu/packages/task-management.scm | 68 +-
gnu/packages/tbb.scm | 4 +-
gnu/packages/terminals.scm | 9 +-
gnu/packages/tex.scm | 109 +
gnu/packages/text-editors.scm | 10 +-
gnu/packages/textutils.scm | 14 +-
gnu/packages/tls.scm | 3 +-
gnu/packages/tor.scm | 4 +-
gnu/packages/uml.scm | 6 +-
gnu/packages/version-control.scm | 39 +-
gnu/packages/video.scm | 48 +-
gnu/packages/vim.scm | 37 +-
gnu/packages/virtualization.scm | 90 +-
gnu/packages/vlang.scm | 8 +-
gnu/packages/vpn.scm | 9 +-
gnu/packages/web-browsers.scm | 5 +-
gnu/packages/web.scm | 120 +-
gnu/packages/webkit.scm | 5 +-
gnu/packages/wm.scm | 17 +-
gnu/packages/wv.scm | 20 +-
gnu/packages/xdisorg.scm | 11 +-
gnu/packages/xorg.scm | 12 +-
gnu/services/base.scm | 18 +-
gnu/services/certbot.scm | 11 +-
gnu/services/cuirass.scm | 48 +-
gnu/services/desktop.scm | 129 +-
gnu/services/dict.scm | 2 +-
gnu/services/docker.scm | 16 +-
gnu/services/linux.scm | 2 +-
gnu/services/messaging.scm | 12 +-
gnu/services/networking.scm | 6 +-
gnu/services/ssh.scm | 131 +-
gnu/services/virtualization.scm | 150 +-
gnu/system/file-systems.scm | 8 +-
gnu/system/image.scm | 154 +-
gnu/system/images/hurd.scm | 32 +-
gnu/system/images/pine64.scm | 59 +
gnu/system/linux-container.scm | 59 +-
gnu/tests/install.scm | 46 +-
gnu/tests/virtualization.scm | 160 +-
guix/build-system/linux-module.scm | 29 +-
guix/describe.scm | 10 +-
guix/gexp.scm | 19 +-
guix/import/cabal.scm | 2 +-
guix/import/cpan.scm | 2 +-
guix/import/opam.scm | 25 +-
guix/import/stackage.scm | 4 +-
guix/licenses.scm | 7 +
guix/openpgp.scm | 2 +-
guix/packages.scm | 159 +-
guix/scripts/authenticate.scm | 192 +-
guix/scripts/build.scm | 138 +-
guix/scripts/environment.scm | 17 +-
guix/scripts/import/hackage.scm | 2 +-
guix/scripts/pack.scm | 39 +-
guix/scripts/package.scm | 43 +-
guix/scripts/repl.scm | 13 +-
guix/scripts/system.scm | 116 +-
guix/self.scm | 2 +-
guix/store/database.scm | 46 +-
guix/store/deduplication.scm | 102 +-
guix/svn-download.scm | 5 +-
guix/ui.scm | 28 +-
nix/libstore/build.cc | 172 +-
nix/libstore/local-store.cc | 104 +-
nix/libutil/util.cc | 84 +
nix/libutil/util.hh | 25 +
nix/local.mk | 17 +-
po/doc/local.mk | 6 +-
po/guix/Makevars | 4 +-
po/guix/POTFILES.in | 1 +
po/packages/Makevars | 4 +-
tests/containers.scm | 8 +
tests/guix-archive.sh | 9 +-
tests/guix-authenticate.sh | 52 +-
tests/guix-build-branch.sh | 3 +-
tests/guix-build.sh | 33 +-
tests/guix-daemon.sh | 2 +-
tests/guix-download.sh | 12 +-
tests/guix-environment-container.sh | 25 +-
tests/guix-environment.sh | 8 +-
tests/guix-gc.sh | 13 +-
tests/guix-git-authenticate.sh | 5 +-
tests/guix-graph.sh | 7 +-
tests/guix-hash.sh | 12 +-
tests/guix-lint.sh | 18 +-
tests/guix-pack-relocatable.sh | 3 +-
tests/guix-pack.sh | 3 +-
tests/guix-package-aliases.sh | 20 +-
tests/guix-package-net.sh | 9 +-
tests/guix-package.sh | 66 +-
tests/guix-repl.sh | 4 +
tests/guix-system.sh | 23 +-
tests/opam.scm | 139 +-
tests/openpgp.scm | 12 +
tests/packages.scm | 172 +-
tests/scripts-build.scm | 26 +-
tests/store.scm | 44 +-
283 files changed, 14884 insertions(+), 8334 deletions(-)
diff --cc gnu/local.mk
index ba94adf,f00485f..4d1ed13
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1154,11 -1162,10 +1161,13 @@@ dist_patch_DATA =
%D%/packages/patches/json-c-0.13-CVE-2020-12762.patch \
%D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \
%D%/packages/patches/jacal-fix-texinfo.patch \
+ %D%/packages/patches/jamvm-1.5.1-aarch64-support.patch \
+ %D%/packages/patches/jamvm-1.5.1-armv7-support.patch \
+ %D%/packages/patches/jamvm-2.0.0-aarch64-support.patch \
%D%/packages/patches/jamvm-2.0.0-disable-branch-patching.patch \
- %D%/packages/patches/jamvm-arm.patch \
+ %D%/packages/patches/jamvm-2.0.0-opcode-guard.patch \
+ %D%/packages/patches/java-antlr4-Add-standalone-generator.patch \
+ %D%/packages/patches/java-antlr4-fix-code-too-large.java \
%D%/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch
\
%D%/packages/patches/java-commons-collections-fix-java8.patch \
%D%/packages/patches/java-jeromq-fix-tests.patch \
diff --cc gnu/packages/enlightenment.scm
index 004fef5,c6920fa..f63bc20
--- a/gnu/packages/enlightenment.scm
+++ b/gnu/packages/enlightenment.scm
@@@ -77,10 -76,10 +76,10 @@@
version ".tar.xz"))
(sha256
(base32
- "0ajwc8lmay5ai7nsrp778g393h0p4h98p4c22gic2w61fgkcd5fy"))))
+ "0vlmf0rp2qxdl06pdmrd1xdfa10sdz30vnxzc98inpdg1n8iz52k"))))
(build-system meson-build-system)
(native-inputs
- `(("check" ,check)
+ `(("check" ,check-0.14)
("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)))
(inputs
diff --cc gnu/packages/lisp-xyz.scm
index 282e300,d167209..b863a91
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@@ -2472,11 -2856,11 +2472,11 @@@ Lisp implementations."
(define-public ecl-closer-mop
(sbcl-package->ecl-package sbcl-closer-mop))
-(define sbcl-cl-cffi-gtk-boot0
+(define-public sbcl-cl-cffi-gtk
- (let ((commit "412d17214e092220c65a5660f5cbbd9cb69b8fe4"))
+ (let ((commit "e9a46df65995d9a16e6c8dbdc1e09b775eb4a966"))
(package
- (name "sbcl-cl-cffi-gtk-boot0")
+ (name "sbcl-cl-cffi-gtk")
- (version (git-version "0.11.2" "1" commit))
+ (version (git-version "0.11.2" "2" commit))
(source
(origin
(method git-fetch)
@@@ -2486,36 -2870,19 +2486,36 @@@
(file-name (git-file-name "cl-cffi-gtk" version))
(sha256
(base32
- "0n997yhcnzk048nalx8ys62ja2ac8iv4mbn3mb55iapl0321hghn"))))
+ "04vix0gmqsj91lm975sx7jhlnz5gq1xf9jp873mp7c8frc5dk1jj"))))
(build-system asdf-build-system/sbcl)
+ (native-inputs
+ `(("fiveam" ,sbcl-fiveam)))
(inputs
- `(("iterate" ,sbcl-iterate)
+ `(("bordeaux-threads" ,sbcl-bordeaux-threads)
+ ("cairo" ,cairo)
("cffi" ,sbcl-cffi)
- ("trivial-features" ,sbcl-trivial-features)
+ ("closer-mop" ,sbcl-closer-mop)
+ ("gdk-pixbuf" ,gdk-pixbuf)
("glib" ,glib)
- ("cairo" ,cairo)
+ ("gtk" ,gtk+)
+ ("iterate" ,sbcl-iterate)
("pango" ,pango)
- ("gdk-pixbuf" ,gdk-pixbuf)
- ("gtk" ,gtk+)))
+ ("trivial-features" ,sbcl-trivial-features)
+ ("trivial-garbage" ,sbcl-trivial-garbage)))
(arguments
- `(#:phases
+ `(#:asd-files '("gtk/cl-cffi-gtk.asd"
+ "glib/cl-cffi-gtk-glib.asd"
+ "gobject/cl-cffi-gtk-gobject.asd"
+ "gio/cl-cffi-gtk-gio.asd"
+ "cairo/cl-cffi-gtk-cairo.asd"
+ "pango/cl-cffi-gtk-pango.asd"
+ "gdk-pixbuf/cl-cffi-gtk-gdk-pixbuf.asd"
+ "gdk/cl-cffi-gtk-gdk.asd")
+ #:test-asd-file "test/cl-cffi-gtk-test.asd"
+ ;; TODO: Tests fail with memory fault.
+ ;; See https://github.com/Ferada/cl-cffi-gtk/issues/24.
+ #:tests? #f
+ #:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
@@@ -2553,14 -2920,225 +2553,14 @@@ is a library for creating graphical use
(define-public cl-cffi-gtk
(sbcl-package->cl-source-package sbcl-cl-cffi-gtk))
+(define-public ecl-cl-cffi-gtk
+ (sbcl-package->ecl-package sbcl-cl-cffi-gtk))
+
(define-public sbcl-cl-webkit
- (let ((commit "dccf9d25de4e9a69f716f8ed9578e58963ead967"))
+ (let ((commit "04bb5703b68f4db9de71529b81896cc428ef54e1"))
(package
(name "sbcl-cl-webkit")
- (version (git-version "2.4" "5" commit))
+ (version (git-version "2.4" "8" commit))
(source
(origin
(method git-fetch)
@@@ -3063,12 -3661,9 +3063,12 @@@ Development into CL+SSL was done by Dav
(define-public cl-cl+ssl
(sbcl-package->cl-source-package sbcl-cl+ssl))
+(define-public ecl-cl+ssl
+ (sbcl-package->ecl-package sbcl-cl+ssl))
+
(define-public sbcl-kmrcl
- (let ((version "1.109.0")
- (commit "5260068b2eb735af6796740c2db4955afac21636")
+ (let ((version "1.111")
+ (commit "4a27407aad9deb607ffb8847630cde3d041ea25a")
(revision "1"))
(package
(name "sbcl-kmrcl")
@@@ -3099,34 -3690,29 +3095,32 @@@ Rosenberg's Common Lisp packages."
(define-public cl-kmrcl
(sbcl-package->cl-source-package sbcl-kmrcl))
+(define-public ecl-kmrcl
+ (sbcl-package->ecl-package sbcl-kmrcl))
+
(define-public sbcl-cl-base64
- (package
- (name "sbcl-cl-base64")
- (version "3.3.4")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "http://files.kpe.io/cl-base64/cl-base64-";
- version ".tar.gz"))
- (sha256
- (base32 "0pl4zwn5bf18dm8fh1kn1yshaa6kpmfrjyb33z9mq4raqmj3xpv2"))))
- (build-system asdf-build-system/sbcl)
- (arguments
- ;; Tests fail with: :FORCE and :FORCE-NOT arguments not allowed
- ;; in a nested call to ASDF/OPERATE:OPERATE unless identically
- ;; to toplevel
- '(#:tests? #f))
- (inputs
- `(("sbcl-ptester" ,sbcl-ptester)
- ("sbcl-kmrcl" ,sbcl-kmrcl)))
- (home-page "http://files.kpe.io/cl-base64/";)
- (synopsis
- "Common Lisp package to encode and decode base64 with URI support")
- (description
- "This package provides highly optimized base64 encoding and decoding.
+ ;; 3.3.4 tests are broken, upstream fixes them.
+ (let ((commit "577683b18fd880b82274d99fc96a18a710e3987a"))
+ (package
+ (name "sbcl-cl-base64")
+ (version (git-version "3.3.4" "1" commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "http://git.kpe.io/cl-base64.git/";)
+ (commit commit)))
+ (sha256
+ (base32 "12jj54h0fs6n237cvnp8v6hn0imfksammq22ys6pi0gwz2w47rbj"))))
+ (build-system asdf-build-system/sbcl)
+ (native-inputs ; For tests.
+ `(("sbcl-ptester" ,sbcl-ptester)
+ ("sbcl-kmrcl" ,sbcl-kmrcl)))
+ (home-page "http://files.kpe.io/cl-base64/";)
+ (synopsis
+ "Common Lisp package to encode and decode base64 with URI support")
+ (description
+ "This package provides highly optimized base64 encoding and decoding.
Besides conversion to and from strings, integer conversions are supported.
Encoding with Uniform Resource Identifiers is supported by using a modified
encoding table that uses only URI-compatible characters.")
diff --cc gnu/packages/web-browsers.scm
index be9fe7a,62d1352..f34e4d7
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@@ -534,41 -534,46 +534,42 @@@ 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-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)
- ("lparallel" ,cl-lparallel)
- ("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)
+ `(("alexandria" ,sbcl-alexandria)
+ ("bordeaux-threads" ,sbcl-bordeaux-threads)
+ ("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)
;; 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")