diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-10 00:02:22 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-10 00:02:22 +0000 |
commit | 3f616fad02c82853a8e6e3cf8fd3aea95945f70e (patch) | |
tree | 13ae002b9f9ee17c56db234f89ae5585b505b16c /doc/languages-frameworks/python.section.md | |
parent | e112f9b8bbb5af9de4426046a7cb4490e2c12eb0 (diff) | |
parent | 2251d8ffde6ad42897b7c97c51e117a2c6ec7f23 (diff) | |
download | nixpkgs-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar nixpkgs-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar.gz nixpkgs-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar.bz2 nixpkgs-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar.lz nixpkgs-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar.xz nixpkgs-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.tar.zst nixpkgs-3f616fad02c82853a8e6e3cf8fd3aea95945f70e.zip |
Merge master into staging-next
Diffstat (limited to 'doc/languages-frameworks/python.section.md')
-rw-r--r-- | doc/languages-frameworks/python.section.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 9af3f529ae4..70150717838 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -264,7 +264,7 @@ python3MyBlas = pkgs.python3.override { ``` This is particularly useful for numpy and scipy users who want to gain speed with other blas implementations. -Note that using simply `scipy = super.scipy.override { blas = super.pkgs.mkl; };` will likely result in +Note that using `scipy = super.scipy.override { blas = super.pkgs.mkl; };` will likely result in compilation issues, because scipy dependencies need to use the same blas implementation as well. #### `buildPythonApplication` function {#buildpythonapplication-function} @@ -433,7 +433,7 @@ python3.withPackages (ps: [ ps.pyramid ]) Now, `ps` is set to `python3Packages`, matching the version of the interpreter. -As [`python.withPackages`](#python.withpackages-function) simply uses [`python.buildEnv`](#python.buildenv-function) under the hood, it also +As [`python.withPackages`](#python.withpackages-function) uses [`python.buildEnv`](#python.buildenv-function) under the hood, it also supports the `env` attribute. The `shell.nix` file from the previous section can thus be also written like this: @@ -682,7 +682,7 @@ b = np.array([3,4]) print(f"The dot product of {a} and {b} is: {np.dot(a, b)}") ``` -Then we simply execute it, without requiring any environment setup at all! +Then we execute it, without requiring any environment setup at all! ```sh $ ./foo.py @@ -1713,7 +1713,7 @@ This is an example of a `default.nix` for a `nix-shell`, which allows to consume a virtual environment created by `venv`, and install Python modules through `pip` the traditional way. -Create this `default.nix` file, together with a `requirements.txt` and simply +Create this `default.nix` file, together with a `requirements.txt` and execute `nix-shell`. ```nix |