[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Thu, 22 Aug 2019 15:55:09 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 893c2df00daa4e6dd6a7ff3813d7df5329877f9e
Merge: 04b9b7b 0ccc9a0
Author: Mark H Weaver <address@hidden>
Date: Thu Aug 22 15:53:27 2019 -0400
Merge branch 'master' into core-updates
doc/guix.texi | 18 +
gnu/build/cross-toolchain.scm | 15 +-
gnu/build/linux-boot.scm | 9 +-
gnu/build/linux-modules.scm | 147 +++++-
gnu/ci.scm | 3 +-
gnu/local.mk | 6 +-
gnu/machine.scm | 27 +-
gnu/machine/ssh.scm | 150 +++++-
gnu/packages/admin.scm | 26 +-
gnu/packages/astronomy.scm | 6 +-
gnu/packages/audio.scm | 10 +-
gnu/packages/bioconductor.scm | 79 ++++
gnu/packages/bioinformatics.scm | 12 +-
gnu/packages/bootstrap.scm | 2 +
gnu/packages/ccache.scm | 15 +-
gnu/packages/ci.scm | 8 +-
gnu/packages/compression.scm | 46 ++
gnu/packages/cran.scm | 168 ++++++-
gnu/packages/cross-base.scm | 6 +-
gnu/packages/databases.scm | 4 +-
gnu/packages/dns.scm | 8 +-
gnu/packages/elm.scm | 81 ++++
gnu/packages/emacs-xyz.scm | 518 ++++++++++++++++++++-
gnu/packages/emulators.scm | 4 +-
gnu/packages/finance.scm | 42 +-
gnu/packages/fonts.scm | 5 +-
gnu/packages/freeipmi.scm | 4 +-
gnu/packages/games.scm | 16 +-
gnu/packages/genealogy.scm | 4 +-
gnu/packages/gnome.scm | 45 +-
gnu/packages/graphics.scm | 47 ++
gnu/packages/guile-xyz.scm | 2 +-
gnu/packages/haskell.scm | 6 +-
gnu/packages/image-processing.scm | 328 ++++++++++++-
gnu/packages/image-viewers.scm | 11 +-
gnu/packages/libreoffice.scm | 4 +-
gnu/packages/linux.scm | 55 ++-
gnu/packages/lisp.scm | 6 +-
gnu/packages/lxqt.scm | 33 ++
gnu/packages/mail.scm | 13 +-
gnu/packages/man.scm | 12 +
gnu/packages/maths.scm | 4 +-
gnu/packages/mingw.scm | 111 +++--
gnu/packages/mpd.scm | 4 +-
gnu/packages/music.scm | 10 +-
gnu/packages/networking.scm | 92 +++-
gnu/packages/package-management.scm | 10 +-
.../patches/elm-compiler-disable-reactor.patch | 71 +++
.../patches/elm-compiler-fix-map-key.patch | 38 ++
.../patches/elm-compiler-relax-glsl-bound.patch | 19 +
gnu/packages/python-web.scm | 29 +-
gnu/packages/python-xyz.scm | 31 ++
gnu/packages/ruby.scm | 70 +++
gnu/packages/sync.scm | 14 +-
gnu/packages/tmux.scm | 6 +-
gnu/packages/tor.scm | 25 +-
gnu/packages/version-control.scm | 6 +-
gnu/packages/video.scm | 44 +-
gnu/packages/web.scm | 14 +-
gnu/packages/wine.scm | 7 +-
gnu/packages/xdisorg.scm | 8 +-
gnu/packages/xorg.scm | 10 +-
gnu/services.scm | 56 +--
gnu/services/base.scm | 9 +-
gnu/system/linux-initrd.scm | 5 +-
guix/build-system/r.scm | 20 +-
guix/channels.scm | 28 +-
guix/derivations.scm | 6 +-
guix/import/cran.scm | 46 +-
guix/import/gnome.scm | 35 +-
guix/remote.scm | 72 +--
guix/scripts/deploy.scm | 25 +-
guix/scripts/describe.scm | 27 +-
guix/scripts/refresh.scm | 45 +-
guix/ssh.scm | 56 ++-
guix/upstream.scm | 9 +-
m4/guix.m4 | 5 +-
tests/derivations.scm | 32 ++
tests/guix-environment-container.sh | 7 +
tests/guix-environment.sh | 8 -
tests/lint.scm | 12 +-
81 files changed, 2657 insertions(+), 470 deletions(-)
diff --cc gnu/build/cross-toolchain.scm
index 53d6d39,201b36f..1704157
--- a/gnu/build/cross-toolchain.scm
+++ b/gnu/build/cross-toolchain.scm
@@@ -3,7 -3,7 +3,8 @@@
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <address@hidden>
;;; Copyright © 2016 Jan Nieuwenhuizen <address@hidden>
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <address@hidden>
+;;; Copyright © 2019 Marius Bakke <address@hidden>
+ ;;; Copyright © 2019 Carl Dong <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/bootstrap.scm
index 8dbe524,cd99425..6cd3e13
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@@ -2,7 -2,7 +2,8 @@@
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic
Courtès <address@hidden>
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <address@hidden>
;;; Copyright © 2017 Efraim Flashner <address@hidden>
+;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen <address@hidden>
+ ;;; Copyright © 2019 Carl Dong <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/cross-base.scm
index 3fc9ba6,e277139..78dae74
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@@ -4,7 -4,7 +4,8 @@@
;;; Copyright © 2016 Jan Nieuwenhuizen <address@hidden>
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2019 Marius Bakke <address@hidden>
+ ;;; Copyright © 2019 Carl Dong <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/mpd.scm
index e807045,e8b1e6e..9758675
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@@ -99,10 -100,20 +99,10 @@@ interfacing MPD in the C, C++ & Objecti
"/mpd-" version ".tar.xz"))
(sha256
(base32
- "1sjyhmq50nlccwmd8xn7m0bk8xvyixvfyr24v9dy3g86hhk0pdwm"))))
+ "0iknnm9xvwfgk8h82hjwrmbijpk9l0dgap0794c2nyg8i66qlb0y"))))
(build-system meson-build-system)
(arguments
- `(#:configure-flags '("-Ddocumentation=true") ; the default is 'false'...
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'expand-C++-include-path
- ;; Make <gcc>/include/c++/ext/string_conversions.h find <stdlib.h>.
- (lambda* (#:key inputs #:allow-other-keys)
- (let* ((path "CPLUS_INCLUDE_PATH")
- (gcc (assoc-ref inputs "gcc"))
- (c++ (string-append gcc "/include/c++")))
- (setenv path (string-append c++ ":" (getenv path)))
- #t))))))
+ `(#:configure-flags '("-Ddocumentation=true"))) ;the default is
'false'...
(inputs `(("ao" ,ao)
("alsa-lib" ,alsa-lib)
("avahi" ,avahi)