From 441a99263f90e0b16e778031afc38e3ac1038bde Mon Sep 17 00:00:00 2001 From: Oleksii Dorozhkin Date: Fri, 31 May 2024 21:30:57 +0200 Subject: [PATCH 1/3] maintainers: add vglfr --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ff48ec64b1ed..00b3bd0cd71f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -21147,6 +21147,12 @@ githubId = 245573; name = "Dmitry Kalinkin"; }; + vglfr = { + email = "vf.velt@gmail.com"; + github = "vglfr"; + githubId = 20283252; + name = "vglfr"; + }; vgskye = { name = "Skye Green"; email = "me@skye.vg"; From 806a3556e04c070160045bc6caba0f3bcf319a42 Mon Sep 17 00:00:00 2001 From: Oleksii Dorozhkin Date: Fri, 31 May 2024 21:37:38 +0200 Subject: [PATCH 2/3] python312Packages.jupyterlab-execute-time: init at 3.1.2 --- .../jupyterlab-execute-time/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/jupyterlab-execute-time/default.nix diff --git a/pkgs/development/python-modules/jupyterlab-execute-time/default.nix b/pkgs/development/python-modules/jupyterlab-execute-time/default.nix new file mode 100644 index 000000000000..ae14143627ef --- /dev/null +++ b/pkgs/development/python-modules/jupyterlab-execute-time/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, jupyterlab +, jupyter-packaging +}: + +buildPythonPackage rec { + pname = "jupyterlab-execute-time"; + version = "3.1.2"; + pyproject = true; + + src = fetchPypi { + pname = "jupyterlab_execute_time"; + inherit version; + hash = "sha256-DiyGsoNXXh+ieMfpSrA6A/5c0ftNV9Ygs9Tl2/VEdbk="; + }; + + # jupyterlab is required to build from source but we use the pre-build package + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"jupyterlab~=4.0.0"' "" + ''; + + nativeBuildInputs = [ + jupyterlab + jupyter-packaging + ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "jupyterlab_execute_time" ]; + + meta = with lib; { + description = "A JupyterLab extension for displaying cell timings"; + homepage = "https://github.com/deshaw/jupyterlab-execute-time"; + license = licenses.bsd3; + maintainers = with maintainers; [ vglfr ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 739e2c577792..0cf499ad750e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6242,6 +6242,8 @@ self: super: with self; { jupyterlab = callPackage ../development/python-modules/jupyterlab { }; + jupyterlab-execute-time = callPackage ../development/python-modules/jupyterlab-execute-time { }; + jupyterlab-git = callPackage ../development/python-modules/jupyterlab-git { }; jupyterlab-pygments = callPackage ../development/python-modules/jupyterlab-pygments { }; From 90cb9fa187df144d5dfe32cc0f7f027346223159 Mon Sep 17 00:00:00 2001 From: vglfr Date: Tue, 2 Jul 2024 20:45:00 +0200 Subject: [PATCH 3/3] python312Packages.jupyterlab-execute-time: review fixes --- .../python-modules/jupyterlab-execute-time/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab-execute-time/default.nix b/pkgs/development/python-modules/jupyterlab-execute-time/default.nix index ae14143627ef..8af2907fe092 100644 --- a/pkgs/development/python-modules/jupyterlab-execute-time/default.nix +++ b/pkgs/development/python-modules/jupyterlab-execute-time/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { --replace '"jupyterlab~=4.0.0"' "" ''; - nativeBuildInputs = [ + dependencies = [ jupyterlab jupyter-packaging ]; @@ -32,10 +32,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "jupyterlab_execute_time" ]; - meta = with lib; { - description = "A JupyterLab extension for displaying cell timings"; + meta = { + description = "JupyterLab extension for displaying cell timings"; homepage = "https://github.com/deshaw/jupyterlab-execute-time"; - license = licenses.bsd3; - maintainers = with maintainers; [ vglfr ]; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.vglfr ]; }; }