Merge branch 'master' into staging

2017-12-09 21:00:07 +01:00
parent 87317bab0a 8f4f9b6223
commit 2309acf723
302 changed files with 4776 additions and 3576 deletions
@@ -134,7 +134,7 @@ with
 ```nix
 with import <nixpkgs> {};

-python35.withPackages (ps: [ps.numpy ps.toolz])
+(python35.withPackages (ps: [ps.numpy ps.toolz])).env
 ```
 Executing `nix-shell` gives you again a Nix shell from which you can run Python.