summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2021-03-01 19:30:56 +0100
committerJan Tojnar <jtojnar@gmail.com>2021-03-01 19:30:56 +0100
commit913394a1d92829cd0ea7114607279ec390a185a6 (patch)
tree445cc44d828f95f1ce3d8af71ea36e75a48e7151 /doc
parent58aa8e36e2c20a4a49beb873afd82ec056d2347b (diff)
parent4b494c403e198921c6e7b09b87dfa091def67c31 (diff)
downloadnixpkgs-913394a1d92829cd0ea7114607279ec390a185a6.tar
nixpkgs-913394a1d92829cd0ea7114607279ec390a185a6.tar.gz
nixpkgs-913394a1d92829cd0ea7114607279ec390a185a6.tar.bz2
nixpkgs-913394a1d92829cd0ea7114607279ec390a185a6.tar.lz
nixpkgs-913394a1d92829cd0ea7114607279ec390a185a6.tar.xz
nixpkgs-913394a1d92829cd0ea7114607279ec390a185a6.tar.zst
nixpkgs-913394a1d92829cd0ea7114607279ec390a185a6.zip
Merge branch 'staging-next' into staging
Diffstat (limited to 'doc')
-rw-r--r--doc/languages-frameworks/python.section.md7
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index f36f5cf0cbb..46491a785a7 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -1554,9 +1554,9 @@ Following rules are desired to be respected:
 
 * Python libraries are called from `python-packages.nix` and packaged with
   `buildPythonPackage`. The expression of a library should be in
-  `pkgs/development/python-modules/<name>/default.nix`. Libraries in
-  `pkgs/top-level/python-packages.nix` are sorted quasi-alphabetically to avoid
-  merge conflicts.
+  `pkgs/development/python-modules/<name>/default.nix`.
+* Libraries in `pkgs/top-level/python-packages.nix` are sorted
+  alphanumerically to avoid merge conflicts and ease locating attributes.
 * Python applications live outside of `python-packages.nix` and are packaged
   with `buildPythonApplication`.
 * Make sure libraries build for all Python interpreters.
@@ -1570,3 +1570,4 @@ Following rules are desired to be respected:
   [PEP 0503](https://www.python.org/dev/peps/pep-0503/#normalized-names). This
   means that characters should be converted to lowercase and `.` and `_` should
   be replaced by a single `-` (foo-bar-baz instead of Foo__Bar.baz )
+* Attribute names in `python-packages.nix` should be sorted alphanumerically.