[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into staging
|
From: |
Marius Bakke |
|
Subject: |
01/01: Merge branch 'master' into staging |
|
Date: |
Sun, 24 Sep 2017 13:21:47 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit ffcff272728e750c62acbbf8322c2ad35d69ad81
Merge: 6baf1b7 030030f
Author: Marius Bakke <address@hidden>
Date: Sun Sep 24 19:18:35 2017 +0200
Merge branch 'master' into staging
doc/guix.texi | 74 +++++++++++++++
gnu/build/vm.scm | 13 ---
gnu/local.mk | 3 +
gnu/packages/audio.scm | 2 +-
gnu/packages/avr.scm | 2 +-
gnu/packages/bioinformatics.scm | 6 +-
gnu/packages/crypto.scm | 8 +-
gnu/packages/disk.scm | 2 +-
gnu/packages/emacs.scm | 19 ++++
gnu/packages/fabric-management.scm | 173 ++++++++++++++++++++++++++++++++++++
gnu/packages/finance.scm | 21 +++--
gnu/packages/freedesktop.scm | 7 +-
gnu/packages/game-development.scm | 26 ++++++
gnu/packages/games.scm | 136 ++++++++++++++++++++++------
gnu/packages/gnome.scm | 79 +++++++++++++++-
gnu/packages/gnunet.scm | 12 +--
gnu/packages/haskell.scm | 40 +++++++++
gnu/packages/ibus.scm | 24 ++---
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/irc.scm | 4 +-
gnu/packages/linux.scm | 16 ++--
gnu/packages/machine-learning.scm | 2 +
gnu/packages/music.scm | 4 +-
gnu/packages/package-management.scm | 2 +-
gnu/packages/parallel.scm | 6 +-
gnu/packages/photo.scm | 4 +-
gnu/packages/python.scm | 10 +--
gnu/packages/statistics.scm | 12 +--
gnu/packages/video.scm | 8 +-
gnu/packages/vim.scm | 21 +++++
gnu/packages/xorg.scm | 4 +-
gnu/services.scm | 3 +-
gnu/services/base.scm | 43 ---------
gnu/services/networking.scm | 54 +++++++----
gnu/services/rsync.scm | 172 +++++++++++++++++++++++++++++++++++
gnu/system.scm | 26 +++---
gnu/system/pam.scm | 47 +++++++++-
gnu/system/uuid.scm | 18 ++++
gnu/tests/rsync.scm | 126 ++++++++++++++++++++++++++
guix/licenses.scm | 6 ++
tests/uuid.scm | 4 +
41 files changed, 1051 insertions(+), 192 deletions(-)
diff --cc gnu/packages/freedesktop.scm
index b9a2b4e,e822f39..950961e
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@@ -357,22 -357,26 +357,25 @@@ manager for the current system."
(build-system python-build-system)
(arguments
'(#:phases
- (alist-replace
- 'check
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "XDG_DATA_DIRS"
- (string-append (assoc-ref inputs "shared-mime-info")
- "/share/"))
- (substitute* "test/test-icon.py"
- (("/usr/share/icons/hicolor/index.theme")
- (string-append (assoc-ref inputs "hicolor-icon-theme")
- "/share/icons/hicolor/index.theme"))
- ;; FIXME: This test fails because the theme contains the unknown
- ;; key "Scale".
- (("theme.validate\\(\\)") "#"))
+ (modify-phases %standard-phases
+ (replace 'check
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "XDG_DATA_DIRS"
+ (string-append (assoc-ref inputs "shared-mime-info")
+ "/share/"))
+ (substitute* "test/test-icon.py"
+ (("/usr/share/icons/hicolor/index.theme")
+ (string-append (assoc-ref inputs "hicolor-icon-theme")
- "/share/icons/hicolor/index.theme")))
++ "/share/icons/hicolor/index.theme"))
++ ;; FIXME: This test fails because the theme contains the
unknown
++ ;; key "Scale".
++ (("theme.validate\\(\\)") "#"))
- ;; One test fails with:
- ;; AssertionError: 'x-apple-ios-png' != 'png'
- (substitute* "test/test-mime.py"
- (("self.check_mimetype\\(imgpng, 'image', 'png'\\)") "#"))
- (zero? (system* "nosetests" "-v")))
- %standard-phases)))
+ ;; One test fails with:
+ ;; AssertionError: 'x-apple-ios-png' != 'png'
+ (substitute* "test/test-mime.py"
+ (("self.check_mimetype\\(imgpng, 'image', 'png'\\)") "#"))
+ (zero? (system* "nosetests" "-v")))))))
(native-inputs
`(("shared-mime-info" ,shared-mime-info) ;for tests
("hicolor-icon-theme" ,hicolor-icon-theme) ;for tests