Merge remote-tracking branch 'upstream/master' into staging

This commit is contained in:
John Ericson
2018-03-22 16:08:22 -04:00
88 changed files with 1874 additions and 1593 deletions

View File

@@ -24,16 +24,16 @@
buildPythonPackage rec {
pname = "notebook";
version = "5.4.0";
version = "5.4.1";
src = fetchPypi {
inherit pname version;
sha256 = "dd431fad9bdd25aa9ff8265da096ef770475e21bf1d327982611a7de5cd904ca";
sha256 = "01l6yp78sp27vns4cxh8ybr7x0pixxn97cp0i3w6s0lv1v8l6qbx";
};
LC_ALL = "en_US.utf8";
buildInputs = [ nose glibcLocales ]
checkInputs = [ nose glibcLocales ]
++ (if isPy3k then [ nose_warnings_filters ] else [ mock ]);
propagatedBuildInputs = [
@@ -44,8 +44,8 @@ buildPythonPackage rec {
# disable warning_filters
preCheck = lib.optionalString (!isPy3k) ''
echo "" > setup.cfg
cat setup.cfg
'';
checkPhase = ''
runHook preCheck
mkdir tmp