guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/08: Merge branch 'master' into staging


From: guix-commits
Subject: 01/08: Merge branch 'master' into staging
Date: Sun, 31 Mar 2019 19:47:44 -0400 (EDT)

mbakke pushed a commit to branch staging
in repository guix.

commit 571fb008a576378883c053be186d2c620290ea39
Merge: 7c86fdd f125c5a
Author: Marius Bakke <address@hidden>
Date:   Mon Apr 1 00:02:39 2019 +0200

    Merge branch 'master' into staging

 build-aux/build-self.scm                           |    6 +-
 doc/contributing.texi                              |    7 +-
 doc/guix.texi                                      |  444 +++--
 .../text-mode/guix-commit-message-rename-package   |   20 +
 gnu.scm                                            |    3 +-
 gnu/bootloader.scm                                 |   43 +-
 gnu/bootloader/grub.scm                            |   35 +
 gnu/build/linux-boot.scm                           |   15 +-
 gnu/installer.scm                                  |   29 +-
 gnu/installer/newt/keymap.scm                      |   13 +-
 gnu/installer/newt/page.scm                        |   38 +
 gnu/installer/newt/partition.scm                   |    8 +-
 gnu/installer/parted.scm                           |   55 +-
 gnu/installer/services.scm                         |    6 +-
 gnu/local.mk                                       |    5 +-
 gnu/packages.scm                                   |   25 +
 gnu/packages/admin.scm                             |   19 +-
 gnu/packages/astronomy.scm                         |   11 +-
 gnu/packages/audio.scm                             |    8 +-
 gnu/packages/base.scm                              |   10 +-
 gnu/packages/bioconductor.scm                      | 1519 ++++++++++++++
 gnu/packages/bioinformatics.scm                    |  334 +---
 gnu/packages/c.scm                                 |   34 +-
 gnu/packages/calendar.scm                          |   16 +-
 gnu/packages/cdrom.scm                             |   25 +-
 gnu/packages/check.scm                             |   11 +-
 gnu/packages/chez.scm                              |    2 +-
 gnu/packages/chromium.scm                          |  153 +-
 gnu/packages/commencement.scm                      |    2 +-
 gnu/packages/compression.scm                       |    4 +-
 gnu/packages/cran.scm                              | 2080 +++++++++++++++++++-
 gnu/packages/crypto.scm                            |    6 +-
 gnu/packages/databases.scm                         |   33 +-
 gnu/packages/display-managers.scm                  |    4 +-
 gnu/packages/django.scm                            |    9 +-
 gnu/packages/dlang.scm                             |   25 +-
 gnu/packages/docker.scm                            |    5 +-
 gnu/packages/dunst.scm                             |    2 +-
 gnu/packages/emacs-xyz.scm                         |  441 ++++-
 gnu/packages/engineering.scm                       |   59 +-
 gnu/packages/file.scm                              |    4 +-
 gnu/packages/fonts.scm                             |  127 +-
 gnu/packages/freedesktop.scm                       |    4 +-
 gnu/packages/ftp.scm                               |   10 +-
 gnu/packages/game-development.scm                  |   85 +-
 gnu/packages/games.scm                             |  858 +++++---
 gnu/packages/gl.scm                                |    2 +-
 gnu/packages/gnome.scm                             |   69 +-
 gnu/packages/gnucash.scm                           |    7 +-
 gnu/packages/gnupg.scm                             |    4 +-
 gnu/packages/gnuzilla.scm                          |    4 +-
 gnu/packages/gpodder.scm                           |  105 +
 gnu/packages/graph.scm                             |  142 ++
 gnu/packages/graphics.scm                          |   28 +-
 gnu/packages/gtk.scm                               |   14 +-
 gnu/packages/guile.scm                             |   32 +-
 gnu/packages/hardware.scm                          |    4 +-
 gnu/packages/haskell-check.scm                     |    6 +-
 gnu/packages/haskell.scm                           |   32 +-
 gnu/packages/image.scm                             |   25 +-
 gnu/packages/kde-frameworks.scm                    |    7 +-
 gnu/packages/linux.scm                             |  106 +-
 gnu/packages/lirc.scm                              |    8 +-
 gnu/packages/lisp.scm                              |    2 +-
 gnu/packages/machine-learning.scm                  |   22 -
 gnu/packages/mail.scm                              |    5 +-
 gnu/packages/mate.scm                              |    2 +-
 gnu/packages/maths.scm                             |  229 +--
 gnu/packages/messaging.scm                         |    4 +-
 gnu/packages/microcom.scm                          |    2 +-
 gnu/packages/music.scm                             |    6 +-
 gnu/packages/nano.scm                              |    4 +-
 gnu/packages/ncurses.scm                           |    8 +-
 gnu/packages/networking.scm                        |    8 +-
 gnu/packages/ocaml.scm                             |   59 +-
 gnu/packages/package-management.scm                |   23 +-
 .../patches/docker-use-fewer-modprobes.patch       |  119 ++
 .../patches/emacs-zones-called-interactively.patch |   43 +
 .../patches/gtk3-fix-deprecation-macro-use.patch   |   28 +
 gnu/packages/patches/reptyr-fix-gcc-7.patch        |   38 -
 gnu/packages/patchutils.scm                        |    2 +-
 gnu/packages/perl-check.scm                        |    7 +-
 gnu/packages/perl-web.scm                          |    2 +-
 gnu/packages/perl.scm                              |   60 +-
 gnu/packages/perl6.scm                             |   21 +-
 gnu/packages/photo.scm                             |    7 +-
 gnu/packages/php.scm                               |   14 +-
 gnu/packages/pretty-print.scm                      |    9 +-
 gnu/packages/python-xyz.scm                        |   60 +-
 gnu/packages/qt.scm                                |   12 +
 gnu/packages/ratpoison.scm                         |   45 +-
 gnu/packages/rust.scm                              |  198 +-
 gnu/packages/samba.scm                             |    2 +-
 gnu/packages/screen.scm                            |   39 +-
 gnu/packages/search.scm                            |    2 +-
 gnu/packages/security-token.scm                    |    4 +-
 gnu/packages/spice.scm                             |    2 +-
 gnu/packages/ssh.scm                               |    8 +-
 gnu/packages/statistics.scm                        |   66 +-
 gnu/packages/telephony.scm                         |  377 ++++
 gnu/packages/terminals.scm                         |    4 +-
 gnu/packages/tex.scm                               |    4 +-
 gnu/packages/tls.scm                               |    4 +-
 gnu/packages/version-control.scm                   |    6 +-
 gnu/packages/video.scm                             |   10 +-
 gnu/packages/w3m.scm                               |    6 +-
 gnu/packages/web.scm                               |   12 +-
 gnu/packages/wine.scm                              |    6 +-
 gnu/packages/xfce.scm                              |   35 +
 gnu/packages/xorg.scm                              |   16 +-
 gnu/services/desktop.scm                           |   16 +-
 gnu/services/networking.scm                        |    3 +-
 gnu/services/sddm.scm                              |   14 +-
 gnu/services/xorg.scm                              |  193 +-
 gnu/system.scm                                     |   83 +-
 gnu/system/accounts.scm                            |    7 +-
 gnu/system/examples/bare-bones.tmpl                |    3 +-
 gnu/system/examples/beaglebone-black.tmpl          |    3 +-
 gnu/system/examples/desktop.tmpl                   |    7 +-
 gnu/system/examples/docker-image.tmpl              |    3 +-
 gnu/system/examples/lightweight-desktop.tmpl       |    3 +-
 gnu/system/install.scm                             |    3 +-
 gnu/system/keyboard.scm                            |   98 +
 gnu/system/linux-container.scm                     |   69 +-
 gnu/system/linux-initrd.scm                        |   26 +-
 gnu/system/vm.scm                                  |   19 +-
 gnu/tests.scm                                      |    5 +-
 gnu/tests/install.scm                              |   14 +-
 gnu/tests/networking.scm                           |    4 +-
 guix/build-system/dune.scm                         |    2 +
 guix/build/dune-build-system.scm                   |   17 +-
 guix/packages.scm                                  |   28 +-
 guix/records.scm                                   |   54 +-
 guix/scripts.scm                                   |    3 +-
 guix/scripts/environment.scm                       |   58 +-
 guix/scripts/pull.scm                              |   40 +-
 guix/scripts/refresh.scm                           |    6 +-
 guix/ui.scm                                        |   10 +-
 guix/upstream.scm                                  |   68 +-
 tests/accounts.scm                                 |    4 -
 tests/guix-environment-container.sh                |   12 +
 tests/pack.scm                                     |    8 +-
 tests/records.scm                                  |   58 +
 tests/scripts.scm                                  |    1 +
 144 files changed, 7927 insertions(+), 1904 deletions(-)

diff --cc gnu/packages/gnome.scm
index cd31dbb,a489137..0fa8141
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -5063,8 -4940,24 +5063,24 @@@ window manager."
                                    name "-" version ".tar.xz"))
                (sha256
                 (base32
 -                "1l8p1ghknmkmjpnpl7jr53j66qbzpikickzbmrz0aczyhq6pdy29"))))
 +                "035lmm21imr7ddpzffqabv53g3ggjscmqvlzy3j1qkv00zrlxg47"))))
+     (outputs '("out" "lib"))
      (build-system glib-or-gtk-build-system)
+     (arguments
+      `(#:configure-flags
+        (list (string-append "--libdir=" (assoc-ref %outputs "out") "/lib"))
+        #:phases
+        (modify-phases %standard-phases
+          (add-before 'configure 'patch-libgoa-output
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let ((lib (assoc-ref outputs "lib")))
+                (substitute* '("src/goa/Makefile.in" "src/goa/goa-1.0.pc.in")
+                  (("@prefix@") lib)
+                  (("@exec_prefix@") lib)
+                  (("@libdir@") (string-append lib "/lib"))
+                  (("@includedir@") (string-append lib "/include"))
+                  (("@datadir@") (string-append lib "/share")))
+                #t))))))
      (native-inputs
       `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
         ("gobject-introspection" ,gobject-introspection)
@@@ -5100,7 -4993,8 +5116,8 @@@ Exchange, Last.fm, IMAP/SMTP, Jabber, S
                                    name "-" version ".tar.xz"))
                (sha256
                 (base32
 -                "12b9lfgwd57rzn9394xrbvl9ym5aqldpz9v7c9a421dsv8dgq13b"))))
 +                "11sq795115vrcgxl9svscm6wg8isjj784c3d84qzb6z47zq92zj3"))))
+     (outputs '("out" "libedataserverui"))
      (build-system cmake-build-system)
      (arguments
       '(;; XXX FIXME: 11/85 tests are failing.
@@@ -6560,11 -6423,9 +6610,12 @@@ desktop.  It supports world clock, sto
         ("pkg-config" ,pkg-config)))
      (inputs
       `(("evolution-data-server" ,evolution-data-server)
-        ("gnome-online-accounts" ,gnome-online-accounts)
+        ("gnome-online-accounts:lib" ,gnome-online-accounts "lib")
         ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
 -       ("libedataserverui" ,evolution-data-server "libedataserverui")))
 +       ("libdazzle" ,libdazzle)
++       ("libedataserverui" ,evolution-data-server "libedataserverui")
 +       ("libgweather" ,libgweather)
 +       ("geoclue" ,geoclue)))
      (home-page "https://wiki.gnome.org/Apps/Calendar";)
      (synopsis "GNOME's calendar application")
      (description



reply via email to

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