Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: af491cbb7d69
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4a979b88718d
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 23, 2019

  1. python2Packages.notebook: restore

    as it is a dependency of sage.
    FRidh committed Oct 23, 2019
    Copy the full SHA
    4a979b8 View commit details
Showing with 78 additions and 1 deletion.
  1. +76 −0 pkgs/development/python-modules/notebook/2.nix
  2. +2 −1 pkgs/top-level/python-packages.nix
76 changes: 76 additions & 0 deletions pkgs/development/python-modules/notebook/2.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
{ stdenv
, lib
, buildPythonPackage
, fetchPypi
, nose
, nose_warnings_filters
, glibcLocales
, isPy3k
, mock
, jinja2
, tornado
, ipython_genutils
, traitlets
, jupyter_core
, jupyter_client
, nbformat
, nbconvert
, ipykernel
, terminado
, requests
, send2trash
, pexpect
, prometheus_client
}:

buildPythonPackage rec {
pname = "notebook";
version = "5.7.8";

src = fetchPypi {
inherit pname version;
sha256 = "573e0ae650c5d76b18b6e564ba6d21bf321d00847de1d215b418acb64f056eb8";
};

LC_ALL = "en_US.utf8";

checkInputs = [ nose glibcLocales ]
++ (if isPy3k then [ nose_warnings_filters ] else [ mock ]);

propagatedBuildInputs = [
jinja2 tornado ipython_genutils traitlets jupyter_core send2trash
jupyter_client nbformat nbconvert ipykernel terminado requests pexpect
prometheus_client
];

# disable warning_filters
preCheck = lib.optionalString (!isPy3k) ''
echo "" > setup.cfg
'';

postPatch = ''
# Remove selenium tests
rm -rf notebook/tests/selenium
'';

checkPhase = ''
runHook preCheck
mkdir tmp
HOME=tmp nosetests -v ${if (stdenv.isDarwin) then ''
--exclude test_delete \
--exclude test_checkpoints_follow_file
''
else ""}
'';

# Some of the tests use localhost networking.
__darwinAllowLocalNetworking = true;

meta = {
description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing";
homepage = https://jupyter.org/;
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ fridh ];
};
}
3 changes: 2 additions & 1 deletion pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
@@ -4015,7 +4015,8 @@ in {

nose_warnings_filters = callPackage ../development/python-modules/nose_warnings_filters { };

notebook = callPackage ../development/python-modules/notebook { };
notebook = if isPy3k then callPackage ../development/python-modules/notebook { }
else callPackage ../development/python-modules/notebook/2.nix { };

notify = callPackage ../development/python-modules/notify { };