diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-04-30 04:03:54 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-04-30 04:03:54 -0400 |
| commit | 3d5ad159b336a9903b31d0be7ae052dbc8d5bfcc (patch) | |
| tree | ee7dce4e436490a1db5f18e4bfad55511d2fff32 /gnu/packages/engineering.scm | |
| parent | c77835db04ee20c0afe20600dc8f91a67bc2421e (diff) | |
| parent | 8c21c64e59d3f4d223d8aeef91f06fdde7de1ab7 (diff) | |
| download | guix-3d5ad159b336a9903b31d0be7ae052dbc8d5bfcc.tar guix-3d5ad159b336a9903b31d0be7ae052dbc8d5bfcc.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/engineering.scm')
| -rw-r--r-- | gnu/packages/engineering.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index e6a29554f1..ed0239a613 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -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" |