Jan Tojnar 8f50f1ce10 Merge branch 'staging-next' into staging ... Resolved the following conflicts: - kernel flags between 09176d28a0 and 2b28822d8d - clojure-lsp between 3fa00685ce and e03c068af5		2021-02-19 17:15:31 +01:00
..
catch_conflicts
cpython	pkgs/development/interpreters: stdenv.lib -> lib	2021-01-23 20:29:03 +07:00
graalpython
hooks	pytestCheckHook: add support for disabling arbitrary paths	2021-02-15 00:34:35 +01:00
manylinux
pypy	Merge pull request #104150 from andersk/pypy-7.3.2	2021-02-13 21:48:05 +09:00
tests
update-python-libraries
default.nix	Merge pull request #104150 from andersk/pypy-7.3.2	2021-02-13 21:48:05 +09:00
fetchpypi.nix
mk-python-derivation.nix	treewide: fix double quoted strings in meta.description	2021-01-24 19:56:59 +07:00
run_setup.py
setup-hook.nix
setup-hook.sh
sitecustomize.py
tests.nix	python.tests: test overriding functions	2021-02-19 10:12:21 +01:00
with-packages.nix
wrap-python.nix
wrap.sh
wrapper.nix	pkgs/development/interpreters: stdenv.lib -> lib	2021-01-23 20:29:03 +07:00