Merge master into staging-next

2020-10-13 19:34:34 +02:00
parent aabcf2d8f5 c5a41da563
commit 9e1943edc0
210 changed files with 11913 additions and 8961 deletions
--- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
+++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py
@@ -33,7 +33,7 @@ PRERELEASES = False

 GIT = "git"

-NIXPGKS_ROOT = str(pathlib.Path(__file__).absolute().parents[5])
+NIXPGKS_ROOT = subprocess.check_output(["git", "rev-parse", "--show-toplevel"]).decode('utf-8').strip()

 import logging
 logging.basicConfig(level=logging.INFO)