From 4b4b12abdc5d4966355f3940a92d610432b61317 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 28 Apr 2025 23:38:39 +0200 Subject: [PATCH] python312Packages.notebook: cleanup --- .../python-modules/notebook/default.nix | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 84720c86da2a..114fb07b7b51 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -3,16 +3,24 @@ stdenv, buildPythonPackage, fetchFromGitHub, + + # nativeBuildInputs nodejs, yarn-berry_3, distutils, + + # build-system hatch-jupyter-builder, hatchling, - jupyter-server, jupyterlab, + + # dependencies + jupyter-server, jupyterlab-server, notebook-shim, tornado, + + # tests pytest-jupyter, pytestCheckHook, }: @@ -31,13 +39,17 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace "timeout = 300" "" + --replace-fail "timeout = 300" "" ''; - nativeBuildInputs = [ - nodejs - yarn-berry_3.yarnBerryConfigHook - ] ++ lib.optional (stdenv.hostPlatform.system == "aarch64-linux") distutils; + nativeBuildInputs = + [ + nodejs + yarn-berry_3.yarnBerryConfigHook + ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + distutils + ]; missingHashes = ./missing-hashes.json;