From ac15f33cf0885571fb73638d6207112014450fc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Thu, 14 Jul 2022 12:29:13 -0400 Subject: [PATCH 1/4] python310Packages.jupyter-server-mathjax: format derivation --- .../python-modules/jupyter-server-mathjax/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix index cd5e1e0f7620..45a35190fce6 100644 --- a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix +++ b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix @@ -1,4 +1,6 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi , jupyter-packaging , jupyter_server , pytest-tornasync From f7aa07b77780316ffd2b97ddd7ede9fe75f1473a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Wed, 13 Jul 2022 23:54:31 -0400 Subject: [PATCH 2/4] python310Packages.jupyter-server-mathjax: fix build on darwin Fix tests that need local network access. --- .../python-modules/jupyter-server-mathjax/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix index 45a35190fce6..6b3ac52767d7 100644 --- a/pkgs/development/python-modules/jupyter-server-mathjax/default.nix +++ b/pkgs/development/python-modules/jupyter-server-mathjax/default.nix @@ -32,6 +32,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "jupyter_server_mathjax" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "MathJax resources as a Jupyter Server Extension"; homepage = "https://jupyter.org"; From dd218acc6680dc26d526dd1a84868010001c1294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Thu, 14 Jul 2022 00:28:02 -0400 Subject: [PATCH 3/4] python310Packages.nbdime: refactor derivation - Move checkInputs and disabledTests after nativeBuildInputs. - Be more specific about disabled tests, because many tests that do pass were being skipped. --- .../python-modules/nbdime/default.nix | 51 ++++++++++--------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index fa72ab748d75..b3c568d1ebba 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -1,11 +1,13 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k , hypothesis , setuptools-scm , six , attrs , py , setuptools -, pytest-cov , pytest-timeout , pytest-tornado , mock @@ -33,26 +35,6 @@ buildPythonPackage rec { sha256 = "67767320e971374f701a175aa59abd3a554723039d39fae908e72d16330d648b"; }; - checkInputs = [ - hypothesis - pytest-cov - pytest-timeout - pytest-tornado - jsonschema - mock - tabulate - pytestCheckHook - ]; - - disabledTests = [ - "test_apply_filter_no_repo" - "test_diff_api_checkpoint" - "test_filter_cmd_invalid_filter" - "test_inline_merge" - "test_interrogate_filter_no_repo" - "test_merge" - ]; - nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ @@ -69,7 +51,30 @@ buildPythonPackage rec { GitPython notebook jinja2 - ]; + ]; + + checkInputs = [ + hypothesis + pytest-timeout + pytest-tornado + jsonschema + mock + tabulate + pytestCheckHook + ]; + + disabledTests = [ + "test_apply_filter_no_repo" + "test_diff_api_checkpoint" + "test_filter_cmd_invalid_filter" + "test_inline_merge_source_add" + "test_inline_merge_source_patches" + "test_inline_merge_source_replace" + "test_inline_merge_cells_insertion" + "test_inline_merge_cells_replacement" + "test_interrogate_filter_no_repo" + "test_merge_input_strategy_inline" + ]; meta = with lib; { homepage = "https://github.com/jupyter/nbdime"; From 4fddc3c9ea6431805374e36ccb7b5e9d1eae2094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Thu, 14 Jul 2022 00:28:26 -0400 Subject: [PATCH 4/4] python310Packages.nbdime: fix build on darwin Fix tests that need local network access. --- pkgs/development/python-modules/nbdime/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index b3c568d1ebba..da00ff3702dd 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -76,6 +76,8 @@ buildPythonPackage rec { "test_merge_input_strategy_inline" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { homepage = "https://github.com/jupyter/nbdime"; description = "Tools for diffing and merging of Jupyter notebooks.";