python3Packages.jupyterhub: 1.1.0 -> 1.3.0

This commit is contained in:
Martin Weinelt 2021-02-12 04:22:18 +01:00
parent d51d55cc7f
commit 31b848653a
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759

View File

@ -1,33 +1,32 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, pythonOlder
, fetchPypi , fetchPypi
, fetchzip , fetchzip
, alembic , alembic
, ipython
, jinja2
, python-oauth2
, prometheus_client
, async_generator , async_generator
, certipy
, dateutil
, entrypoints
, jinja2
, jupyter-telemetry
, oauthlib
, pamela , pamela
, prometheus_client
, requests
, sqlalchemy , sqlalchemy
, tornado , tornado
, traitlets , traitlets
, requests
, notebook
, pythonOlder
, nodePackages , nodePackages
, oauthlib
, certipy
, jupyter-telemetry
}: }:
let let
# js/css assets that setup.py tries to fetch via `npm install` when building # js/css assets that setup.py tries to fetch via `npm install` when building
# from source. # from source. https://github.com/jupyterhub/jupyterhub/blob/master/package.json
bootstrap = bootstrap =
fetchzip { fetchzip {
url = "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz"; url = "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.1.tgz";
sha256 = "0r7s54bbf68ri1na9bbabyf12mcpb6zk5ja2q6z82aw1fa4xi3yd"; sha256 = "1ywmxqdccg0mgx0xknrn1hlrfnhcwphc12y9l91zizx26fqfmzgc";
}; };
font-awesome = font-awesome =
fetchzip { fetchzip {
@ -36,30 +35,30 @@ let
}; };
jquery = jquery =
fetchzip { fetchzip {
url = "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz"; url = "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz";
sha256 = "1j6y18miwzafdj8kfpwbmbn9qvgnbnpc7l4arqrhqj33m04xrlgi"; sha256 = "0yi9ql493din1qa1s923nd5zvd0klk1sx00xj1wx2yambmq86vm9";
}; };
moment = moment =
fetchzip { fetchzip {
url = "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz"; url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz";
sha256 = "12gb3p0rz5wyjwykv9g0pix7dd352lx1z7rzdjsf2brhwc4ffyip"; sha256 = "0ifzzla4zffw23g3xvhwx3fj3jny6cjzxfzl1x0317q8wa0c7w5i";
}; };
requirejs = requirejs =
fetchzip { fetchzip {
url = "https://registry.npmjs.org/requirejs/-/requirejs-2.3.4.tgz"; url = "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz";
sha256 = "0q6mkj0iv341kks06dya6lfs2kdw0n6vc7n4a7aa3ia530fk9vja"; sha256 = "165hkli3qcd59cjqvli9r5f92i0h7czkmhcg1cgwamw2d0b7xibz";
}; };
in in
buildPythonPackage rec { buildPythonPackage rec {
pname = "jupyterhub"; pname = "jupyterhub";
version = "1.1.0"; version = "1.3.0";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.6";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "1mqknz0rxqzx4nc57vscvfh2d4znzlzpy83ancqxdaq3b8i70al5"; sha256 = "13pf6qhimpaxj20871ff5rvwwan59320cdhhrn9cfh6314971zq5";
}; };
# Most of this only applies when building from source (e.g. js/css assets are # Most of this only applies when building from source (e.g. js/css assets are
@ -86,12 +85,7 @@ buildPythonPackage rec {
"'${nodePackages.configurable-http-proxy}/bin/configurable-http-proxy'" "'${nodePackages.configurable-http-proxy}/bin/configurable-http-proxy'"
substituteInPlace setup.py --replace \ substituteInPlace setup.py --replace \
"'npm', 'run', 'lessc', '--'" \ "'npm'" "'true'"
"'${nodePackages.less}/bin/lessc'"
substituteInPlace setup.py --replace \
"'npm', 'install', '--progress=false'" \
"'true'"
declare -A deps declare -A deps
deps[bootstrap]=${bootstrap} deps[bootstrap]=${bootstrap}
@ -109,9 +103,21 @@ buildPythonPackage rec {
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = [
alembic ipython jinja2 pamela python-oauth2 requests sqlalchemy tornado # https://github.com/jupyterhub/jupyterhub/blob/master/requirements.txt
traitlets prometheus_client async_generator notebook certipy oauthlib alembic
async_generator
certipy
dateutil
entrypoints
jinja2
jupyter-telemetry jupyter-telemetry
oauthlib
pamela
prometheus_client
requests
sqlalchemy
tornado
traitlets
]; ];
# Disable tests because they take an excessive amount of time to complete. # Disable tests because they take an excessive amount of time to complete.