Merge branch 'master' into core-updates

This commit is contained in:
Ricardo Wurmus 2018-02-18 00:37:46 +01:00
commit ff9d1a2f0c
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
17 changed files with 812 additions and 27 deletions

View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 David Thompson <davet@gnu.org>
@ -178,6 +178,13 @@ plans and designs.")
(add-before 'check 'set-home
(lambda _
(setenv "HOME" (getenv "TMPDIR"))
#t))
;; FIXME: These two tests fail for unknown reasons. They return "2"
;; when they should return "1".
(add-after 'unpack 'disable-failing-tests
(lambda _
(substitute* "utils/tests/gxyrs/tests.list"
(("^do_nothing.*") ""))
#t)))
#:configure-flags
(let ((pcb (assoc-ref %build-inputs "pcb")))