Merge branch 'master' into unused5

2018-07-21 15:41:22 +01:00
parent cd6e2c9642 e85db6863a
commit 218298b30f
203 changed files with 1655 additions and 627 deletions
@@ -23,7 +23,7 @@
 }:

 let
-  inherit (stdenv.lib) optional optionals optionalString concatStringsSep;
+  inherit (stdenv.lib) optional optionals optionalString;
  inherit (stdenv) isDarwin;

 in buildPythonPackage rec {