mhw pushed a commit to branch core-updates in repository guix. commit 82b695b834f88c5561de40e68f3fe7aa24d3b796 Merge: fe365a3 ee3c8fb Author: Mark H Weaver <m...@netris.org> Date: Mon May 28 20:45:37 2018 -0400
Merge branch 'master' into core-updates doc/guix.texi | 70 +++-- gnu/bootloader/grub.scm | 10 +- gnu/build/file-systems.scm | 54 +--- gnu/build/linux-boot.scm | 12 +- gnu/build/shepherd.scm | 3 +- gnu/local.mk | 4 + gnu/packages/algebra.scm | 36 +++ gnu/packages/audio.scm | 12 +- gnu/packages/bootloaders.scm | 47 ++- gnu/packages/check.scm | 20 ++ gnu/packages/code.scm | 58 +++- gnu/packages/compression.scm | 19 +- gnu/packages/cpp.scm | 120 ++++++++ gnu/packages/games.scm | 4 +- gnu/packages/gnuzilla.scm | 10 +- gnu/packages/java.scm | 336 ++++++++++++++++++++- gnu/packages/linux.scm | 49 ++- gnu/packages/messaging.scm | 8 +- gnu/packages/music.scm | 47 +-- gnu/packages/networking.scm | 17 +- .../patches/fifo-map-fix-flags-for-gcc.patch | 39 +++ .../patches/fifo-map-remove-catch.hpp.patch | 30 ++ gnu/packages/patches/libmygpo-qt-fix-qt-5.11.patch | 78 +++++ .../patches/libmygpo-qt-missing-qt5-modules.patch | 51 ++++ gnu/packages/qt.scm | 309 ++++++++++--------- gnu/packages/video.scm | 7 + gnu/services/base.scm | 17 +- gnu/system.scm | 38 +-- gnu/system/examples/bare-bones.tmpl | 3 +- gnu/system/examples/beaglebone-black.tmpl | 3 +- gnu/system/examples/lightweight-desktop.tmpl | 4 +- gnu/system/examples/vm-image.tmpl | 3 +- gnu/system/file-systems.scm | 108 ++++++- gnu/system/install.scm | 4 +- gnu/system/vm.scm | 7 +- gnu/tests.scm | 3 +- gnu/tests/install.scm | 26 +- guix/scripts/pack.scm | 109 ++++++- guix/scripts/system.scm | 31 +- tests/guix-system.sh | 9 +- tests/system.scm | 6 +- 41 files changed, 1426 insertions(+), 395 deletions(-) diff --cc gnu/packages/compression.scm index e145d53,a428e6c..9921cd5 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@@ -1,10 -1,10 +1,10 @@@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2012, 2013, 2014, 2015, 2017 Ludovic Courtès <l...@gnu.org> ;;; Copyright © 2013 Andreas Enge <andr...@enge.fr> -;;; Copyright © 2014, 2015 Mark H Weaver <m...@netris.org> +;;; Copyright © 2014, 2015, 2018 Mark H Weaver <m...@netris.org> ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayi...@gmail.com> ;;; Copyright © 2015, 2016 Eric Bavier <bav...@member.fsf.org> - ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rek...@elephly.net> + ;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rek...@elephly.net> ;;; Copyright © 2015, 2017, 2018 Leo Famulari <l...@famulari.name> ;;; Copyright © 2015 Jeff Mickey <j...@codemac.net> ;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efr...@flashner.co.il> diff --cc gnu/packages/music.scm index 6f17fa7,7ae0d9a..ff34728 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@@ -197,37 -197,35 +197,37 @@@ score, keyboard, guitar, drum and contr (uri (git-reference (url "https://github.com/clementine-player/Clementine.git") (commit commit))) - (file-name (string-append name "-" version "-checkout")) + (file-name (git-file-name name version)) (sha256 (base32 - "0cdcj7di7j9jgzc1ihjna1a5df64f9hnmx7b9kh8rlg76hc0l0hi")) + "1hximk3q0p8nw8is5w7215xgkb7k4flnfyr0pdz9svfwvcm05w1i")) (modules '((guix build utils))) (snippet - '(for-each + '(begin + (for-each (lambda (dir) (delete-file-recursively - (string-append "3rdparty/" dir))) + (string-append "3rdparty/" dir))) (list - ;; TODO: The following dependencies are still bundled: - ;; - "qxt": Appears to be unmaintained upstream. - ;; - "qsqlite" - ;; - "qtsingleapplication" - ;; - "qocoa" - ;; - "qtiocompressor" - ;; - "gmock": The tests crash when using our googletest - ;; package instead of the bundled gmock. - "SPMediaKeyTap" - "fancytabwidget" - "google-breakpad" - "libmygpo-qt" - "libmygpo-qt5" - "libprojectm" - "qtwin" - "sha2" ;; Replaced by openssl. - "taglib" - "tinysvcmdns"))) + ;; TODO: The following dependencies are still bundled: + ;; - "qxt": Appears to be unmaintained upstream. + ;; - "qsqlite" + ;; - "qtsingleapplication" + ;; - "qocoa" + ;; - "qtiocompressor" + ;; - "gmock": The tests crash when using our googletest + ;; package instead of the bundled gmock. + "SPMediaKeyTap" + "fancytabwidget" + "google-breakpad" + "libmygpo-qt" + "libmygpo-qt5" + "libprojectm" + "qtwin" + "sha2" ;; Replaced by openssl. + "taglib" + "tinysvcmdns")) + #t)) (patches (search-patches "clementine-use-openssl.patch" "clementine-remove-crypto++-dependency.patch")))) (build-system cmake-build-system)