Merge branch 'master' into staging-next

2020-05-18 21:09:27 +02:00
parent ade7faea72 567f0a3df1
commit 7f40cfd97b
501 changed files with 11984 additions and 6526 deletions
--- a/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh
+++ b/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh
@@ -4,12 +4,14 @@ venvShellHook() {

    if [ -d "${venvDir}" ]; then
      echo "Skipping venv creation, '${venvDir}' already exists"
+      source "${venvDir}/bin/activate"
    else
      echo "Creating new venv environment in path: '${venvDir}'"
      @pythonInterpreter@ -m venv "${venvDir}"
-    fi

-    source "${venvDir}/bin/activate"
+      source "${venvDir}/bin/activate"
+      runHook postVenvCreation
+    fi

    runHook postShellHook
    echo "Finished executing venvShellHook"