summary refs log tree commit diff
path: root/doc/languages-frameworks
diff options
context:
space:
mode:
authorobadz <obadz-git@obadz.com>2016-08-22 01:19:35 +0100
committerobadz <obadz-git@obadz.com>2016-08-22 01:19:35 +0100
commit24a9183f907cec515724484d84b0cf236de2e8d0 (patch)
tree67ab37c4de5d8e8f17b78cc8c6680f25edf7d930 /doc/languages-frameworks
parentba50fd71700bf796ea2339115733ca5a850015ea (diff)
parentb092538811a2bd4454ed9b056952c0a10f091076 (diff)
downloadnixlib-24a9183f907cec515724484d84b0cf236de2e8d0.tar
nixlib-24a9183f907cec515724484d84b0cf236de2e8d0.tar.gz
nixlib-24a9183f907cec515724484d84b0cf236de2e8d0.tar.bz2
nixlib-24a9183f907cec515724484d84b0cf236de2e8d0.tar.lz
nixlib-24a9183f907cec515724484d84b0cf236de2e8d0.tar.xz
nixlib-24a9183f907cec515724484d84b0cf236de2e8d0.tar.zst
nixlib-24a9183f907cec515724484d84b0cf236de2e8d0.zip
Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
Diffstat (limited to 'doc/languages-frameworks')
-rw-r--r--doc/languages-frameworks/python.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
index 89659c2166b1..56a4b526641f 100644
--- a/doc/languages-frameworks/python.md
+++ b/doc/languages-frameworks/python.md
@@ -632,7 +632,7 @@ Given a `default.nix`:
     src = ./.; }
 
 Running `nix-shell` with no arguments should give you
-the environment in which the package would be build with
+the environment in which the package would be built with
 `nix-build`.
 
 Shortcut to setup environments with C headers/libraries and python packages: