diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-07-21 15:41:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-21 15:41:22 +0100 |
commit | 218298b30fe79be30716438a1906d1abd61b9377 (patch) | |
tree | 65e0041ee5468689142d669c4c4fc4f73f3618ba /pkgs/development/python-modules/pandas | |
parent | cd6e2c9642b8e608c905f350cece21141435deef (diff) | |
parent | e85db6863a546cfdde0150f03ed0d2db28992575 (diff) | |
download | nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar.gz nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar.bz2 nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar.lz nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar.xz nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.tar.zst nixpkgs-218298b30fe79be30716438a1906d1abd61b9377.zip |
Merge branch 'master' into unused5
Diffstat (limited to 'pkgs/development/python-modules/pandas')
-rw-r--r-- | pkgs/development/python-modules/pandas/0.17.1.nix | 2 | ||||
-rw-r--r-- | pkgs/development/python-modules/pandas/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/pandas/0.17.1.nix b/pkgs/development/python-modules/pandas/0.17.1.nix index e4973d0d6e3..c481aa0dfea 100644 --- a/pkgs/development/python-modules/pandas/0.17.1.nix +++ b/pkgs/development/python-modules/pandas/0.17.1.nix @@ -21,7 +21,7 @@ }: let - inherit (stdenv.lib) optional optionalString concatStringsSep; + inherit (stdenv.lib) optional optionalString; inherit (stdenv) isDarwin; in buildPythonPackage rec { pname = "pandas"; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index fc75e5803af..ef07f2a36e3 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -23,7 +23,7 @@ }: let - inherit (stdenv.lib) optional optionals optionalString concatStringsSep; + inherit (stdenv.lib) optional optionals optionalString; inherit (stdenv) isDarwin; in buildPythonPackage rec { |