diff options
| author | Robin Gloster <mail@glob.in> | 2016-08-16 07:54:01 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-08-16 07:54:01 +0000 |
| commit | 33e1c78ae3681719b389d4ead425afa4433f445d (patch) | |
| tree | 015a86dbeb3b745e5daf876c184ccbd6b91f2db2 /doc | |
| parent | 1747d28e5ada05ec07c4b1d35048ea5b194bde64 (diff) | |
| parent | 888efed972d95e1f2bc31e4394ff841f0690d216 (diff) | |
| download | nixpkgs-33e1c78ae3681719b389d4ead425afa4433f445d.tar nixpkgs-33e1c78ae3681719b389d4ead425afa4433f445d.tar.gz nixpkgs-33e1c78ae3681719b389d4ead425afa4433f445d.tar.bz2 nixpkgs-33e1c78ae3681719b389d4ead425afa4433f445d.tar.lz nixpkgs-33e1c78ae3681719b389d4ead425afa4433f445d.tar.xz nixpkgs-33e1c78ae3681719b389d4ead425afa4433f445d.tar.zst nixpkgs-33e1c78ae3681719b389d4ead425afa4433f445d.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/languages-frameworks/python.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index 9bce4980517..eb85dd59e6b 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -566,7 +566,7 @@ running `nix-shell` with the following `shell.nix` with import <nixpkgs> {}; (python3.buildEnv.override { - extraLibs = with python3Packages; [ numpy requests ]; + extraLibs = with python3Packages; [ numpy requests2 ]; }).env will drop you into a shell where Python will have the @@ -605,7 +605,7 @@ attribute. The `shell.nix` file from the previous section can thus be also writt with import <nixpkgs> {}; - (python33.withPackages (ps: [ps.numpy ps.requests])).env + (python33.withPackages (ps: [ps.numpy ps.requests2])).env In contrast to `python.buildEnv`, `python.withPackages` does not support the more advanced options such as `ignoreCollisions = true` or `postBuild`. If you need them, you have to use `python.buildEnv`. |