diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-04-08 15:47:00 -0400 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-04-08 15:47:00 -0400 |
commit | 533a893cc6b03f100566760d6e0c8e0500ed7082 (patch) | |
tree | 0ecbf89895a400c43d16bb1f6539f1a88aeaa4cf /gnu/packages/simulation.scm | |
parent | 6a2546f92d07df04e5d700924edd027ed1e2ef11 (diff) | |
parent | c762df54786fd6f005f3b5307323f1d2df3cbf0b (diff) | |
download | guix-533a893cc6b03f100566760d6e0c8e0500ed7082.tar.gz guix-533a893cc6b03f100566760d6e0c8e0500ed7082.zip |
Merge branch 'master' into staging
Conflicts:
.guix-authorizations
gnu/ci.scm
gnu/packages/base.scm
gnu/packages/databases.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/imagemagick.scm
gnu/packages/password-utils.scm
gnu/packages/python-xyz.scm
gnu/packages/web-browsers.scm
Diffstat (limited to 'gnu/packages/simulation.scm')
-rw-r--r-- | gnu/packages/simulation.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 45efd5c472..e1de78402d 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -602,7 +602,7 @@ user interface to the FEniCS core components and external libraries.") license:lgpl3+)))) (define-public fenics - (package (inherit fenics-dolfin) + (package/inherit fenics-dolfin (name "fenics") (build-system python-build-system) (inputs |