@@ -638,7 +638,7 @@ are disabled.
638638
639639#### Using pythonImportsCheck
640640
641−Although unit tests are highly prefered to valid correctness of a package. Not
641+Although unit tests are highly prefered to validate correctness of a package, not
642642all packages have test suites that can be ran easily, and some have none at all.
643643To help ensure the package still works, `pythonImportsCheck` can attempt to import
644644the listed modules.
@@ -1551,13 +1551,11 @@ In a `setup.py` or `setup.cfg` it is common to declare dependencies:
15511551
15521552### Contributing guidelines
15531553
1554−Following rules are desired to be respected:
1554+The following rules are desired to be respected:
15551555
15561556* Python libraries are called from `python-packages.nix` and packaged with
15571557 `buildPythonPackage`. The expression of a library should be in
15581558 `pkgs/development/python-modules/<name>/default.nix`.
1559−* Libraries in `pkgs/top-level/python-packages.nix` are sorted
1560− alphanumerically to avoid merge conflicts and ease locating attributes.
15611559* Python applications live outside of `python-packages.nix` and are packaged
15621560 with `buildPythonApplication`.
15631561* Make sure libraries build for all Python interpreters.
@@ -1567,8 +1565,11 @@ Following rules are desired to be respected:
15671565 case, when you disable tests, leave a comment explaining why.
15681566* Commit names of Python libraries should reflect that they are Python
15691567 libraries, so write for example `pythonPackages.numpy: 1.11 -> 1.12`.
1570−* Attribute names in `python-packages.nix` should be normalized according to
1571− [PEP 0503](https://www.python.org/dev/peps/pep-0503/#normalized-names). This
1572− means that characters should be converted to lowercase and `.` and `_` should
1573− be replaced by a single `-` (foo-bar-baz instead of Foo__Bar.baz )
1574−* Attribute names in `python-packages.nix` should be sorted alphanumerically.
1568+* Attribute names in `python-packages.nix` as well as `pname`s should match the
1569+ library's name on PyPI, but be normalized according to [PEP
1570+ 0503](https://www.python.org/dev/peps/pep-0503/#normalized-names). This means
1571+ that characters should be converted to lowercase and `.` and `_` should be
1572+ replaced by a single `-` (foo-bar-baz instead of Foo__Bar.baz).
1573+ If necessary, `pname` has to be given a different value within `fetchPypi`.
1574+* Attribute names in `python-packages.nix` should be sorted alphanumerically to
1575+ avoid merge conflicts and ease locating attributes.