Skip to content

Commit 7a61788

Browse files
committedMay 7, 2017
Merge remote-tracking branch 'upstream/master' into HEAD
2 parents d4dde07 + d316088 commit 7a61788

File tree

102 files changed

+1419
-880
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+1419
-880
lines changed
 

‎doc/languages-frameworks/python.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ running `nix-shell` with the following `shell.nix`
580580
with import <nixpkgs> {};
581581
582582
(python3.buildEnv.override {
583-
extraLibs = with python3Packages; [ numpy requests2 ];
583+
extraLibs = with python3Packages; [ numpy requests ];
584584
}).env
585585
```
586586

@@ -622,7 +622,7 @@ attribute. The `shell.nix` file from the previous section can thus be also writt
622622
```nix
623623
with import <nixpkgs> {};
624624
625-
(python33.withPackages (ps: [ps.numpy ps.requests2])).env
625+
(python33.withPackages (ps: [ps.numpy ps.requests])).env
626626
```
627627

628628
In contrast to `python.buildEnv`, `python.withPackages` does not support the more advanced options

‎lib/maintainers.nix

+2
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@
152152
e-user = "Alexander Kahl <nixos@sodosopa.io>";
153153
ebzzry = "Rommel Martinez <ebzzry@gmail.com>";
154154
edanaher = "Evan Danaher <nixos@edanaher.net>";
155+
edef = "edef <edef@edef.eu>";
155156
ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>";
156157
eduarrrd = "Eduard Bachmakov <e.bachmakov@gmail.com>";
157158
edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
@@ -297,6 +298,7 @@
297298
luispedro = "Luis Pedro Coelho <luis@luispedro.org>";
298299
lukego = "Luke Gorrie <luke@snabb.co>";
299300
lw = "Sergey Sofeychuk <lw@fmap.me>";
301+
m3tti = "Mathaeus Sander <mathaeus.peter.sander@gmail.com>";
300302
ma27 = "Maximilian Bosch <maximilian@mbosch.me>";
301303
madjar = "Georges Dubus <georges.dubus@compiletoi.net>";
302304
magnetophon = "Bart Brouns <bart@magnetophon.nl>";

0 commit comments

Comments
 (0)
Please sign in to comment.