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: c637aeff19b5
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6705421c98fa
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Mar 29, 2019

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    0b31827 View commit details

Commits on Mar 31, 2019

  1. Merge pull request #58542 from Infinisil/fix/jupyterhub

    pythonPackages.jupyterhub: Fix running locally
    infinisil authored Mar 31, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    6705421 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/development/python-modules/jupyterhub/default.nix
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/jupyterhub/default.nix
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@
, tornado
, traitlets
, requests
, notebook
, pythonOlder
, nodePackages
}:
@@ -106,7 +107,7 @@ buildPythonPackage rec {

propagatedBuildInputs = [
alembic ipython jinja2 pamela python-oauth2 requests sqlalchemy tornado
traitlets prometheus_client async_generator
traitlets prometheus_client async_generator notebook
];

# Disable tests because they take an excessive amount of time to complete.