[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: Merge branch 'staging' into core-updates
|
From: |
guix-commits |
|
Subject: |
02/02: Merge branch 'staging' into core-updates |
|
Date: |
Thu, 4 Jul 2019 10:34:35 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 2cb827b38ede254f87d3ce745a95f51f238c4373
Merge: 5ab605b 42dcfca
Author: Marius Bakke <address@hidden>
Date: Thu Jul 4 16:29:53 2019 +0200
Merge branch 'staging' into core-updates
gnu/packages/audio.scm | 8 +-
gnu/packages/bioinformatics.scm | 4 +-
gnu/packages/crypto.scm | 8 +-
gnu/packages/emacs-xyz.scm | 32 ++++
gnu/packages/finance.scm | 185 ++++++++++++---------
gnu/packages/image-viewers.scm | 108 ++++++------
gnu/packages/imagemagick.scm | 5 +-
gnu/packages/irc.scm | 4 +-
gnu/packages/linux.scm | 12 +-
gnu/packages/lisp.scm | 57 +++++++
gnu/packages/mail.scm | 25 +--
gnu/packages/mpd.scm | 4 +-
gnu/packages/music.scm | 4 +-
gnu/packages/password-utils.scm | 73 ++++++++
.../patches/monero-use-system-miniupnpc.patch | 95 ++---------
gnu/packages/python-xyz.scm | 4 +-
gnu/packages/ruby.scm | 48 ++++--
gnu/packages/video.scm | 22 ++-
gnu/packages/virtualization.scm | 20 ++-
gnu/packages/vpn.scm | 4 +-
gnu/packages/xdisorg.scm | 8 +-
gnu/packages/xfce.scm | 35 ++--
gnu/packages/xorg.scm | 4 +-
guix/derivations.scm | 33 ++--
guix/profiles.scm | 3 +-
guix/store.scm | 12 +-
26 files changed, 493 insertions(+), 324 deletions(-)
diff --cc gnu/packages/mpd.scm
index f72256f,51c674c..d65ac33
--- 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
- "0fx9n6qmyb4ls17j7kl58i1ivg9wfx9zm9wyfnwzw7lcwdl56sqk"))))
+ "1gbcg8icm0pp918jw1lx1j066m39zg9wyqjla328ic848j5zhbnk"))))
(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)