guix-commits
[Top][All Lists]
Advanced

[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: Sun, 22 Nov 2020 17:55:05 -0500 (EST)

mbakke pushed a commit to branch staging
in repository guix.

commit a485a98ca8296d760251e9d870583117ac50979e
Merge: 84d1b50 1ca0c34
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Nov 22 23:36:09 2020 +0100

    Merge branch 'master' into staging

 doc/guix.texi                                      |   11 +-
 gnu/build/linux-initrd.scm                         |   13 +-
 gnu/ci.scm                                         |    4 +-
 gnu/local.mk                                       |    3 +-
 gnu/packages/admin.scm                             |    2 +-
 gnu/packages/aidc.scm                              |    2 +-
 gnu/packages/algebra.scm                           |    4 +-
 gnu/packages/assembly.scm                          |    2 +-
 gnu/packages/audio.scm                             |    6 +-
 gnu/packages/browser-extensions.scm                |    6 +-
 gnu/packages/check.scm                             |    6 +-
 gnu/packages/clojure.scm                           |   22 +-
 gnu/packages/compression.scm                       |    2 +-
 gnu/packages/coq.scm                               |    2 +-
 gnu/packages/crates-graphics.scm                   |   27 +-
 gnu/packages/crates-io.scm                         | 1419 ++++++++++++++++----
 gnu/packages/cups.scm                              |   35 +-
 gnu/packages/dictionaries.scm                      |    2 +-
 gnu/packages/disk.scm                              |    2 +-
 gnu/packages/django.scm                            |    5 +-
 gnu/packages/djvu.scm                              |  112 ++
 gnu/packages/docker.scm                            |    6 +-
 gnu/packages/documentation.scm                     |    2 +-
 gnu/packages/emacs-xyz.scm                         |  354 +++--
 gnu/packages/embedded.scm                          |    4 +-
 gnu/packages/enchant.scm                           |    2 +-
 gnu/packages/file-systems.scm                      |   74 +
 gnu/packages/fontutils.scm                         |    2 +-
 gnu/packages/game-development.scm                  |    4 +-
 gnu/packages/games.scm                             |    4 +-
 gnu/packages/geo.scm                               |    2 +-
 gnu/packages/gimp.scm                              |    2 +-
 gnu/packages/gnome-xyz.scm                         |    2 +-
 gnu/packages/gnome.scm                             |    8 +-
 gnu/packages/gnuzilla.scm                          |    8 +-
 gnu/packages/golang.scm                            |    4 +-
 gnu/packages/graphics.scm                          |   10 +-
 gnu/packages/gstreamer.scm                         |    8 +-
 gnu/packages/guile-xyz.scm                         |   10 +-
 gnu/packages/haskell-web.scm                       |   43 +
 gnu/packages/heads.scm                             |   34 +
 gnu/packages/image.scm                             |    2 +-
 gnu/packages/irc.scm                               |   18 +-
 gnu/packages/java.scm                              |    2 +-
 gnu/packages/language.scm                          |    4 +-
 gnu/packages/lego.scm                              |   58 +-
 gnu/packages/libusb.scm                            |    4 +-
 gnu/packages/linux.scm                             |  113 +-
 gnu/packages/lisp-xyz.scm                          |    6 +-
 gnu/packages/lisp.scm                              |   37 +
 gnu/packages/lxqt.scm                              |    2 +-
 gnu/packages/mail.scm                              |    2 +-
 gnu/packages/man.scm                               |    2 +-
 gnu/packages/messaging.scm                         |   60 +-
 gnu/packages/music.scm                             |   59 +-
 gnu/packages/networking.scm                        |   10 +-
 gnu/packages/ocaml.scm                             |    8 +-
 gnu/packages/openstack.scm                         |  223 +--
 gnu/packages/package-management.scm                |   10 +-
 gnu/packages/parallel.scm                          |    4 +-
 .../patches/gajim-honour-GAJIM_PLUGIN_PATH.patch   |   11 +
 gnu/packages/patches/xpra-4.0.4-norequests.patch   |   39 -
 gnu/packages/python-check.scm                      |   67 +
 gnu/packages/python-crypto.scm                     |    2 +-
 gnu/packages/python-web.scm                        |  391 +++++-
 gnu/packages/python-xyz.scm                        |  315 +++--
 gnu/packages/qt.scm                                |    2 +-
 gnu/packages/raspberry-pi.scm                      |    4 +-
 gnu/packages/rdesktop.scm                          |    2 +-
 gnu/packages/ruby.scm                              |   30 +-
 gnu/packages/rust-apps.scm                         |   18 +-
 gnu/packages/scheme.scm                            |    2 +-
 gnu/packages/shellutils.scm                        |    4 +-
 gnu/packages/simulation.scm                        |   18 +-
 gnu/packages/storage.scm                           |    4 +-
 gnu/packages/syncthing.scm                         |    2 +-
 gnu/packages/tls.scm                               |    8 +-
 gnu/packages/video.scm                             |   18 +-
 gnu/packages/vim.scm                               |   44 +-
 gnu/packages/web.scm                               |    4 +-
 gnu/packages/xfce.scm                              |    1 +
 gnu/packages/xml.scm                               |   17 +-
 gnu/packages/xorg.scm                              |    7 +-
 gnu/services/base.scm                              |    3 +-
 gnu/services/cups.scm                              |    3 +-
 gnu/services/sddm.scm                              |    2 +-
 gnu/system/images/pinebook-pro.scm                 |   66 +
 guix/build/cargo-build-system.scm                  |    7 +
 guix/cpio.scm                                      |   33 +-
 guix/import/hackage.scm                            |   14 +-
 guix/import/stackage.scm                           |    8 +-
 guix/lint.scm                                      |   83 +-
 guix/scripts/build.scm                             |   13 +-
 guix/scripts/environment.scm                       |    2 +
 guix/scripts/graph.scm                             |    5 +-
 guix/scripts/install.scm                           |    2 +
 guix/scripts/lint.scm                              |   15 +-
 guix/scripts/pack.scm                              |    2 +
 guix/scripts/package.scm                           |    2 +
 guix/scripts/publish.scm                           |    6 +-
 guix/scripts/upgrade.scm                           |    2 +
 guix/store.scm                                     |    6 +
 guix/transformations.scm                           |   16 +-
 po/doc/guix-manual.fr.po                           |   47 +-
 tests/lint.scm                                     |   88 ++
 tests/store-database.scm                           |   26 +-
 106 files changed, 3335 insertions(+), 1020 deletions(-)

diff --cc gnu/packages/lisp-xyz.scm
index 776865f,c103d99..a4e9739
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@@ -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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]