1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-16 12:00:35 +02:00

Merge branch 'master' into core-updates

This commit is contained in:
Mark H Weaver 2018-04-30 04:03:54 -04:00
commit 3d5ad159b3
No known key found for this signature in database
GPG key ID: 7CEF29847562C516
105 changed files with 29149 additions and 23582 deletions

View file

@ -3,7 +3,7 @@
;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016, 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
@ -585,7 +585,9 @@ as well as pick-place files.")
(file-name (git-file-name name version))
(snippet
;; Remove bundled catch since we provide our own.
'(delete-file "libfive/test/catch.hpp"))))
'(begin
(delete-file "libfive/test/catch.hpp")
#t))))
(build-system cmake-build-system)
(arguments
`(#:test-target "libfive-test"