diff options
| author | Marius Bakke <[email protected]> | 2022-09-10 17:27:06 +0200 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2022-09-10 17:27:06 +0200 |
| commit | 07140e8b10c56bc271c74fa82470a900684b91c6 (patch) | |
| tree | 8b452a7a676f4791d4d824e19f9892d6ae6eaf82 /gnu/packages/python-science.scm | |
| parent | cbc391102966336a1a175204ebbf4aeec66e3018 (diff) | |
| parent | 575dbab74622ee8304827b98865a26225145e22a (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/python-science.scm')
| -rw-r--r-- | gnu/packages/python-science.scm | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index b218759bf8..8143088d11 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -1478,3 +1478,9 @@ Dask, PyTorch, Tensorflow, CuPy, Sparse, Theano, JAX, and Autograd arrays as well as potentially any library which conforms to a standard API. See the documentation for more information.") (license license:expat))) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; |