diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2019-01-25 15:40:25 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2019-01-25 15:40:25 +0100 |
| commit | a64676e088b20b3678c3b7b031139857e56f6658 (patch) | |
| tree | fe331a11c235b2c67a0c44cb3564dd539a90a3e3 | |
| parent | 02d38bd3a2c964698ef08524d6313b726ce63846 (diff) | |
| parent | 81cf0174b5cfb03fecaf183ad07217b80210ffe7 (diff) | |
| download | guix-a64676e088b20b3678c3b7b031139857e56f6658.tar guix-a64676e088b20b3678c3b7b031139857e56f6658.tar.gz | |
Merge branch 'master' into staging
| -rw-r--r-- | gnu/packages/fabric-management.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/kde-frameworks.scm | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm index ff6ad898b1..5422170dfe 100644 --- a/gnu/packages/fabric-management.scm +++ b/gnu/packages/fabric-management.scm @@ -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"))) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 353f9e4528..3865bc1b2e 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -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)) |