Merge branch 'master' into staging-next

2019-11-27 22:57:50 -08:00
parent 4cc592761d f4f8169021
commit 0c1c18ca44
207 changed files with 4017 additions and 3629 deletions
--- a/pkgs/development/python-modules/uproot/default.nix
+++ b/pkgs/development/python-modules/uproot/default.nix
@@ -3,6 +3,7 @@
 , backports_lzma
 , cachetools
 , lz4
+, pandas
 , pytestrunner
 , pytest
 , pkgconfig
@@ -27,6 +28,7 @@ buildPythonPackage rec {
  checkInputs = [
    lz4
    mock
+    pandas
    pkgconfig
    pytest
    requests