Merge branch 'master' into staging
This commit is contained in:
commit
a64676e088
|
@ -1,6 +1,7 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2017 Dave Love <fx@gnu.org>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -120,9 +121,6 @@ running the opensm daemon.")
|
|||
"--disable-static")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(add-before 'configure 'autotools
|
||||
(lambda _
|
||||
(zero? (system "./autogen.sh"))))
|
||||
(add-after 'install 'licence
|
||||
(lambda _
|
||||
(let ((doc (string-append (assoc-ref %outputs "lib") "/share/doc")))
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
;;; Copyright © 2016 David Craven <david@craven.ch>
|
||||
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
|
||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -578,6 +579,13 @@ propagate their changes to their respective configuration files.")
|
|||
(lambda _
|
||||
(display "[test_channels]\n*\n")))
|
||||
#t))
|
||||
;; See upstream commit ee424e9b62368485bba4193053cabb553a1d268e
|
||||
(add-after 'unpack 'fix-broken-test
|
||||
(lambda _
|
||||
(substitute* "autotests/kdirwatch_unittest.cpp"
|
||||
(("QVERIFY\\(waitForRecreationSignal\\(watch, existingFile\\)\\);" m)
|
||||
(string-append m "\nwaitUntilNewSecond();")))
|
||||
#t))
|
||||
(add-before 'check 'check-setup
|
||||
(lambda _
|
||||
(setenv "HOME" (getcwd))
|
||||
|
|
Loading…
Reference in New Issue