Merge branch 'master' into unused5

This commit is contained in:
Jörg Thalheim
2018-07-21 15:41:22 +01:00
committed by GitHub
203 changed files with 1655 additions and 627 deletions

View File

@@ -21,7 +21,7 @@
}:
let
inherit (stdenv.lib) optional optionalString concatStringsSep;
inherit (stdenv.lib) optional optionalString;
inherit (stdenv) isDarwin;
in buildPythonPackage rec {
pname = "pandas";

View File

@@ -23,7 +23,7 @@
}:
let
inherit (stdenv.lib) optional optionals optionalString concatStringsSep;
inherit (stdenv.lib) optional optionals optionalString;
inherit (stdenv) isDarwin;
in buildPythonPackage rec {