From 997ad9005be6f0848130d01cf6a1868546ed3a2a Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 27 Apr 2025 22:42:52 +0900 Subject: [PATCH 1/4] python312Packages.jupyterlab: 4.3.6 -> 4.4.1 Changelog: https://github.com/jupyterlab/jupyterlab/blob/v4.4.1/CHANGELOG.md --- pkgs/development/python-modules/jupyterlab/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index f77549abf019..34a8fa417a8d 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -24,14 +24,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "4.3.6"; + version = "4.4.1"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchPypi { inherit pname version; - hash = "sha256-KQD/2/yp7TfErX/do+t2WC/ZRdRpYq86xkdBri1rL/Q="; + hash = "sha256-x1xPMwVvvYTwsx60RiKgDHpfmBuFrf6xmKg3IfBGWAg="; }; build-system = [ From 79ac249383cc2458712a1411820b24c0974da476 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 27 Apr 2025 22:42:58 +0900 Subject: [PATCH 2/4] python312Packages.notebook: 7.3.3 -> 7.4.1 Changelog: https://github.com/jupyter/notebook/blob/v7.4.1/CHANGELOG.md --- pkgs/development/python-modules/notebook/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 3d0e1acb3670..8fa6afd499e2 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchPypi, hatch-jupyter-builder, hatchling, @@ -16,14 +15,12 @@ buildPythonPackage rec { pname = "notebook"; - version = "7.3.3"; + version = "7.4.1"; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchPypi { inherit pname version; - hash = "sha256-cHoxP7iC01+SGYnrPSBN6ULtUTKkTkqh/g6PJLudwl0="; + hash = "sha256-lolJYrIwAT6gwKRm5OZCxarOJbqMhmhhdbaZkO9ij/k="; }; postPatch = '' From 84251ef49a42d1a0def886d4c14f91eca1c20cfb Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 27 Apr 2025 23:45:51 +0900 Subject: [PATCH 3/4] python312Packages.jupyterlab: build from source --- .../python-modules/jupyterlab/default.nix | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 34a8fa417a8d..30eb5286a7c6 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -1,7 +1,9 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + nodejs, + yarn-berry_3, hatch-jupyter-builder, hatchling, async-lru, @@ -27,11 +29,32 @@ buildPythonPackage rec { version = "4.4.1"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-x1xPMwVvvYTwsx60RiKgDHpfmBuFrf6xmKg3IfBGWAg="; + src = fetchFromGitHub { + owner = "jupyterlab"; + repo = "jupyterlab"; + tag = "v${version}"; + hash = "sha256-j1K5aBLLGSWER3S0Vojrwdd+9T9vYbp1+XgxYD2NORY="; }; + nativeBuildInputs = [ + nodejs + yarn-berry_3.yarnBerryConfigHook + ]; + + preConfigure = '' + pushd jupyterlab/staging + ''; + + offlineCache = yarn-berry_3.fetchYarnBerryDeps { + inherit src; + sourceRoot = "${src.name}/jupyterlab/staging"; + hash = "sha256-rko09rqT7UQUq/Ddi8lo3V02eJQEEnpjH5RaLSgqj/o="; + }; + + preBuild = '' + popd + ''; + build-system = [ hatch-jupyter-builder hatchling From 6de1a44bd29aaba5ce975c8ac1efcade3e99ebc3 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 28 Apr 2025 02:17:23 +0900 Subject: [PATCH 4/4] python312Packages.notebook: build from source --- .../python-modules/notebook/default.nix | 24 +++++++++++++++---- .../notebook/missing-hashes.json | 12 ++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/python-modules/notebook/missing-hashes.json diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 8fa6afd499e2..46143c1f8ce5 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -1,7 +1,9 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + nodejs, + yarn-berry_3, hatch-jupyter-builder, hatchling, jupyter-server, @@ -18,9 +20,11 @@ buildPythonPackage rec { version = "7.4.1"; pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-lolJYrIwAT6gwKRm5OZCxarOJbqMhmhhdbaZkO9ij/k="; + src = fetchFromGitHub { + owner = "jupyter"; + repo = "notebook"; + tag = "v${version}"; + hash = "sha256-Xz9EZgYNJjWsN7tcTmwXLwH9VW7GnI0P/oNT0IFpkoE="; }; postPatch = '' @@ -28,6 +32,18 @@ buildPythonPackage rec { --replace "timeout = 300" "" ''; + nativeBuildInputs = [ + nodejs + yarn-berry_3.yarnBerryConfigHook + ]; + + missingHashes = ./missing-hashes.json; + + offlineCache = yarn-berry_3.fetchYarnBerryDeps { + inherit src missingHashes; + hash = "sha256-IFLAwEFsI/GL26XAfiLDyW1mG72gcN2TH651x8Nbrtw="; + }; + build-system = [ hatch-jupyter-builder hatchling diff --git a/pkgs/development/python-modules/notebook/missing-hashes.json b/pkgs/development/python-modules/notebook/missing-hashes.json new file mode 100644 index 000000000000..363e4c54d983 --- /dev/null +++ b/pkgs/development/python-modules/notebook/missing-hashes.json @@ -0,0 +1,12 @@ +{ + "@nx/nx-darwin-arm64@npm:16.10.0": "aabcc8499602b98c9fc3b768fe46dfd4e1b818caa84b740bd4f73a2e4528c719b979ecb1c10a0d793a1fead83073a08bc86417588046aa3e587e80af880bffd3", + "@nx/nx-darwin-x64@npm:16.10.0": "9dd20f45f646d05306f23f5abb7ade69dcb962e23a013101e93365847722079656d30a19c735fdcfa5c4e0fdf08691f9d621073c58aef2861c26741ff4638375", + "@nx/nx-freebsd-x64@npm:16.10.0": "35b93aabe3b3274d53157a6fc10fec7e341e75e6818e96cfbc89c3d5b955d225ca80a173630b6aa43c448c6b53b23f06a2699a25c0c8bc71396ee20a023d035f", + "@nx/nx-linux-arm-gnueabihf@npm:16.10.0": "697b9fa4c70f84d3ea8fe32d47635864f2e40b0ceeb1484126598c61851a2ec34b56bb3eeb9654c37d9b14e81ce85a36ac38946b4b90ca403c57fe448be51ccb", + "@nx/nx-linux-arm64-gnu@npm:16.10.0": "001e71fedfc763a4dedd6c5901b66a4a790d388673fb74675235e19bb8fe031ff3755568ed867513dd003f873901fabda31a7d5628b39095535cb9f6d1dc7191", + "@nx/nx-linux-arm64-musl@npm:16.10.0": "58e3b71571bdadd2b0ddd24ea6e30cd795e706ada69f685403412c518fba1a2011ac8c2ac46145eab14649aa5a78e0cedcdb4d327ccb3b6ec12e055171f3840b", + "@nx/nx-linux-x64-gnu@npm:16.10.0": "97729a7efb27301a67ebf34739784114528ddb54047e63ca110a985eaa0763c5b1ea7c623ead1a2266d07107951be81e82ffa0a30e6e4d97506659303f2c8c78", + "@nx/nx-linux-x64-musl@npm:16.10.0": "442bdbd5e61324a850e4e7bd6f54204108580299d3c7c4ebcec324da9a63e23f48d797a87593400fc32af78a3a03a3c104bfb360f107fe732e6a6c289863853a", + "@nx/nx-win32-arm64-msvc@npm:16.10.0": "b5c74184ebfc70294e85f8e309f81c3d40b5cf99068891e613f3bef5ddb946bef7c9942d9e6c7688e22006d45d786342359af3b4fc87aadf369afcda55c73187", + "@nx/nx-win32-x64-msvc@npm:16.10.0": "c5b174ebd7a5916246088e17d3761804b88f010b6b3f930034fa49af00da33b6d1352728c733024f736e4c2287def75bafdc3d60d8738bd24b67e9a4f11763f8" +}