Merge branch 'master' into staging
authorMarius Bakke <marius@gnu.org>
Sun, 22 Nov 2020 22:36:09 +0000 (23:36 +0100)
committerMarius Bakke <marius@gnu.org>
Sun, 22 Nov 2020 22:36:09 +0000 (23:36 +0100)
24 files changed:
1  2 
doc/guix.texi
gnu/local.mk
gnu/packages/check.scm
gnu/packages/compression.scm
gnu/packages/gnome.scm
gnu/packages/gnuzilla.scm
gnu/packages/golang.scm
gnu/packages/gstreamer.scm
gnu/packages/image.scm
gnu/packages/java.scm
gnu/packages/linux.scm
gnu/packages/lisp-xyz.scm
gnu/packages/lisp.scm
gnu/packages/messaging.scm
gnu/packages/networking.scm
gnu/packages/python-crypto.scm
gnu/packages/python-web.scm
gnu/packages/python-xyz.scm
gnu/packages/qt.scm
gnu/packages/ruby.scm
gnu/packages/video.scm
gnu/packages/web.scm
gnu/packages/xorg.scm
guix/build/cargo-build-system.scm

diff --cc doc/guix.texi
Simple merge
diff --cc gnu/local.mk
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -2545,14 -2927,225 +2545,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 "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)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge