summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorDima <dgoldin+github@protonmail.ch>2020-01-31 12:51:39 +0100
committerJon <jonringer@users.noreply.github.com>2020-02-02 09:39:58 -0800
commite9ba4b94fb8c9454e2ec5a2a1246a6b2f856169f (patch)
tree0a6b6c77f2ffd6dce37fdae95e848f97477f2cba /doc
parentc2d2c2d0cabea4dd4be9f51a0be9469d886a18be (diff)
downloadnixpkgs-e9ba4b94fb8c9454e2ec5a2a1246a6b2f856169f.tar
nixpkgs-e9ba4b94fb8c9454e2ec5a2a1246a6b2f856169f.tar.gz
nixpkgs-e9ba4b94fb8c9454e2ec5a2a1246a6b2f856169f.tar.bz2
nixpkgs-e9ba4b94fb8c9454e2ec5a2a1246a6b2f856169f.tar.lz
nixpkgs-e9ba4b94fb8c9454e2ec5a2a1246a6b2f856169f.tar.xz
nixpkgs-e9ba4b94fb8c9454e2ec5a2a1246a6b2f856169f.tar.zst
nixpkgs-e9ba4b94fb8c9454e2ec5a2a1246a6b2f856169f.zip
doc: python: fixing mistake in venv example
When updating the section to python 3 some places still
referred to pythonPackages and were overlooked.
Decided to switch it to be more similar to the first
example binding pythonPackages and clarified comments a
bit based on confusion I observed on IRC.

Related to https://github.com/NixOS/nixpkgs/pull/77569
Diffstat (limited to 'doc')
-rw-r--r--doc/languages-frameworks/python.section.md25
1 files changed, 15 insertions, 10 deletions
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 9b6de47c8e8..e183bd8160d 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -1061,11 +1061,9 @@ in pkgs.mkShell rec {
     pythonPackages.numpy
     pythonPackages.requests
 
-    # the following packages are related to the dependencies of your python
-    # project.
-    # In this particular example the python modules listed in the
-    # requirements.txt require the following packages to be installed locally
-    # in order to compile any binary extensions they may require.
+    # In this particular example, in order to compile any binary extensions they may
+    # require, the python modules listed in the hypothetical requirements.txt need
+    # the following packages to be installed locally:
     taglib
     openssl
     git
@@ -1075,7 +1073,8 @@ in pkgs.mkShell rec {
     zlib
   ];
 
-  # Now we can execute any commands within the virtual environment
+  # Now we can execute any commands within the virtual environment.
+  # This is optional and can be left out to run pip manually.
   postShellHook = ''
     pip install -r requirements.txt
   '';
@@ -1091,12 +1090,14 @@ with import <nixpkgs> { };
 
 let
   venvDir = "./.venv";
+  pythonPackages = python3Packages;
 in pkgs.mkShell rec {
   name = "impurePythonEnv";
   buildInputs = [
-    python3Packages.python
-    python3Packages.virtualenv
-    ...
+    pythonPackages.python
+    # Needed when using python 2.7
+    # pythonPackages.virtualenv
+    # ...
   ];
 
   # This is very close to how venvShellHook is implemented, but
@@ -1108,14 +1109,18 @@ in pkgs.mkShell rec {
       echo "Skipping venv creation, '${venvDir}' already exists"
     else
       echo "Creating new venv environment in path: '${venvDir}'"
+      # Note that the module venv was only introduced in python 3, so for 2.7
+      # this needs to be replaced with a call to virtualenv
       ${pythonPackages.python.interpreter} -m venv "${venvDir}"
     fi
 
     # Under some circumstances it might be necessary to add your virtual
     # environment to PYTHONPATH, which you can do here too;
-    # PYTHONPATH=$PWD/${venvDir}/${python.sitePackages}/:$PYTHONPATH
+    # PYTHONPATH=$PWD/${venvDir}/${pythonPackages.python.sitePackages}/:$PYTHONPATH
 
     source "${venvDir}/bin/activate"
+
+    # As in the previous example, this is optional.
     pip install -r requirements.txt
   '';
 }