Merge master into staging-next

2018-11-19 09:55:32 +01:00
parent 5f575e7339 c4cad8cfa7
commit e343a85cfb
116 changed files with 2864 additions and 2274 deletions
@@ -6,7 +6,8 @@
 }:

 let
-  python2Env = python2.withPackages(ps: with ps; [ numpy lxml ]);
+  python2Env = python2.withPackages(ps: with ps;
+    [ numpy lxml scour ]);
 in

 stdenv.mkDerivation rec {