summaryrefslogtreecommitdiff
path: root/gnu/packages/python-science.scm
diff options
context:
space:
mode:
authorMarius Bakke <[email protected]>2022-09-10 17:30:17 +0200
committerMarius Bakke <[email protected]>2022-09-10 17:30:17 +0200
commit1d526f5035ce51305d8f414b8f55066adedb6f91 (patch)
tree7cc1fb957d10d06b770bb55dfa30dd3a00beec5d /gnu/packages/python-science.scm
parentb4693f4a58b977c92282c81d3032f5be990e866a (diff)
parent07140e8b10c56bc271c74fa82470a900684b91c6 (diff)
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/python-science.scm')
-rw-r--r--gnu/packages/python-science.scm6
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.
+;;;