diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-06-23 18:45:21 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-06-23 18:45:21 +0200 |
| commit | 9dea3f101f252331c049c03f501398a5ec837ba9 (patch) | |
| tree | 61d683a9fae3e147332d07fef207c1ddf51fc301 /gnu/packages/python-science.scm | |
| parent | 7f0af119a1e3ea9d0ae53811b619437b3e942702 (diff) | |
| parent | 620669fd17306c2edb21c64a99fa47160fefb319 (diff) | |
| download | guix-patches-9dea3f101f252331c049c03f501398a5ec837ba9.tar guix-patches-9dea3f101f252331c049c03f501398a5ec837ba9.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/cups.scm
gnu/packages/python-web.scm
gnu/packages/web.scm
guix/build/maven/pom.scm
Diffstat (limited to 'gnu/packages/python-science.scm')
| -rw-r--r-- | gnu/packages/python-science.scm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 10fb2403e6..d2c4caac3a 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -73,8 +73,7 @@ ("python-matplotlib" ,python-matplotlib) ("python-pyparsing" ,python-pyparsing))) (inputs - `(("lapack" ,lapack) - ("openblas" ,openblas) + `(("openblas" ,openblas) ("pybind11" ,pybind11))) (native-inputs `(("python-cython" ,python-cython) |