Merge branch 'master' into staging

This commit is contained in:
Marius Bakke 2020-11-22 23:36:09 +01:00
commit a485a98ca8
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
106 changed files with 3322 additions and 1007 deletions

View file

@ -2549,10 +2549,10 @@ is a library for creating graphical user interfaces.")
(sbcl-package->ecl-package sbcl-cl-cffi-gtk))
(define-public sbcl-cl-webkit
(let ((commit "04bb5703b68f4db9de71529b81896cc428ef54e1"))
(let ((commit "aecd76a2bcc7bfee049c91d94cc75f893800bf37"))
(package
(name "sbcl-cl-webkit")
(version (git-version "2.4" "8" commit))
(version (git-version "2.4" "9" commit))
(source
(origin
(method git-fetch)
@ -2562,7 +2562,7 @@ is a library for creating graphical user interfaces.")
(file-name (git-file-name "cl-webkit" version))
(sha256
(base32
"12dzqgkvgwi97r8dbflslj7nsx7p6iavx82fs48nj9wf7ln1c87s"))))
"1j2wvn19kz0bcg17qr9pc4xp6fgjy8zngdnnp5rpfxd25sli62yc"))))
(build-system asdf-build-system/sbcl)
(inputs
`(("cffi" ,sbcl-cffi)