nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into staging

This commit is contained in:
Ricardo Wurmus 2019-01-25 15:40:25 +01:00
parent 02d38bd3a2 81cf0174b5
commit a64676e088
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/packages/fabric-management.scm
View File

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Dave Love <fx@gnu.org> ;;; Copyright © 2017 Dave Love <fx@gnu.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -120,9 +121,6 @@ running the opensm daemon.")
"--disable-static") "--disable-static")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'autotools
(lambda _
(zero? (system "./autogen.sh"))))
(add-after 'install 'licence (add-after 'install 'licence
(lambda _ (lambda _
(let ((doc (string-append (assoc-ref %outputs "lib") "/share/doc"))) (let ((doc (string-append (assoc-ref %outputs "lib") "/share/doc")))

8
gnu/packages/kde-frameworks.scm
View File

@ -5,6 +5,7 @@
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -578,6 +579,13 @@ propagate their changes to their respective configuration files.")
(lambda _ (lambda _
(display "[test_channels]\n*\n"))) (display "[test_channels]\n*\n")))
#t)) #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 (add-before 'check 'check-setup
(lambda _ (lambda _
(setenv "HOME" (getcwd)) (setenv "HOME" (getcwd))