diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-13 00:01:45 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-13 00:01:45 +0000 |
commit | c0c7fbda14cd086d25ab9250025a32df1c1da61d (patch) | |
tree | 4821a328964310c5208752e732567f4e6a5929c8 /pkgs/development/python-modules/jupyter-repo2docker | |
parent | 699560194d2b2c4e8e27e815e88073277fbe9212 (diff) | |
parent | 3f915b4cb7aed0b111c8b714d51e9a000599b64e (diff) | |
download | nixpkgs-c0c7fbda14cd086d25ab9250025a32df1c1da61d.tar nixpkgs-c0c7fbda14cd086d25ab9250025a32df1c1da61d.tar.gz nixpkgs-c0c7fbda14cd086d25ab9250025a32df1c1da61d.tar.bz2 nixpkgs-c0c7fbda14cd086d25ab9250025a32df1c1da61d.tar.lz nixpkgs-c0c7fbda14cd086d25ab9250025a32df1c1da61d.tar.xz nixpkgs-c0c7fbda14cd086d25ab9250025a32df1c1da61d.tar.zst nixpkgs-c0c7fbda14cd086d25ab9250025a32df1c1da61d.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/python-modules/jupyter-repo2docker')
-rw-r--r-- | pkgs/development/python-modules/jupyter-repo2docker/default.nix | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index b59b9adb248..4e66e332b07 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -1,9 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder +{ lib +, bash +, buildPythonPackage +, chardet , docker +, entrypoints , escapism +, fetchFromGitHub +, iso8601 , jinja2 , pkgs-docker , python-json-logger +, pythonOlder , pyyaml , ruamel-yaml , semver @@ -12,18 +19,24 @@ }: buildPythonPackage rec { - version = "2021.8.0"; + version = "2021.08.0"; pname = "jupyter-repo2docker"; - disabled = pythonOlder "3.4"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "9d1b3c3ec7944ea6b0a234d6fa77293a2d1ed1c080eba8466aba94f811b3465d"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "jupyterhub"; + repo = "repo2docker"; + rev = version; + sha256 = "10hcdag7ivyqyiqrmr9c48zynp8d81ic3px1ffgnaysih7lvkwb6"; }; propagatedBuildInputs = [ docker + entrypoints escapism + iso8601 jinja2 pkgs-docker python-json-logger @@ -33,7 +46,7 @@ buildPythonPackage rec { traitlets ]; - # tests not packaged with pypi release + # Tests require a running Docker instance doCheck = false; pythonImportsCheck = [ @@ -44,9 +57,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://repo2docker.readthedocs.io/en/latest/"; - description = "Repo2docker: Turn code repositories into Jupyter enabled Docker Images"; + description = "Turn code repositories into Jupyter enabled Docker Images"; + homepage = "https://repo2docker.readthedocs.io/"; license = licenses.bsdOriginal; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } |