From 9e60d14097e9241fc86c7649f64b1b62c01ba085 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 28 Aug 2022 12:33:24 +0200 Subject: [PATCH 1/2] python39Packages.jupyterlab_server: fix failing build --- .../jupyterlab_server/default.nix | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 38f146a71d13..648090ff2e4d 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi , hatchling @@ -14,7 +13,7 @@ , pytest-timeout , pytest-tornasync , ruamel-yaml -, strict-rfc3339 +, importlib-metadata }: buildPythonPackage rec { @@ -28,19 +27,17 @@ buildPythonPackage rec { sha256 = "sha256-qRxRXg55caj3w8mDS3SIV/faxQL5NgS/KDmHmR/Zh+8="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "--cov jupyterlab_server --cov-report term-missing --cov-report term:skip-covered" "" - - # translation tests try to install additional packages into read only paths - rm -r tests/translations/ - ''; - nativeBuildInputs = [ hatchling ]; - propagatedBuildInputs = [ requests jsonschema json5 babel jupyter_server ]; + propagatedBuildInputs = [ + requests + jsonschema + json5 + babel + jupyter_server + ] ++ lib.optional (pythonOlder "3.10") importlib-metadata; checkInputs = [ openapi-core @@ -50,19 +47,25 @@ buildPythonPackage rec { ruamel-yaml ]; + postPatch = '' + # translation tests try to install additional packages into read only paths + rm -r tests/translations/ + ''; + preCheck = '' export HOME=$(mktemp -d) ''; pytestFlagsArray = [ - # DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives + # DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. + # Use setuptools or check PEP 632 for potential alternatives. "-W ignore::DeprecationWarning" ]; __darwinAllowLocalNetworking = true; meta = with lib; { - description = "JupyterLab Server"; + description = "A set of server components for JupyterLab and JupyterLab like applications"; homepage = "https://jupyter.org"; license = licenses.bsdOriginal; maintainers = [ maintainers.costrouc ]; From 160cc410687209fc0a11d417bc6563ffa1babc7d Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 28 Aug 2022 12:41:41 +0200 Subject: [PATCH 2/2] python310Packages.jupyterlab_server: 2.15.0 -> 2.15.1 --- pkgs/development/python-modules/jupyterlab_server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 648090ff2e4d..2ae55b6bacd3 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "2.15.0"; + version = "2.15.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qRxRXg55caj3w8mDS3SIV/faxQL5NgS/KDmHmR/Zh+8="; + sha256 = "sha256-MFMTlw4THFkM93u2uMp+mFkbwwQRHo0QO8kdIS6UeW8="; }; nativeBuildInputs = [