From 0e7b8055e4273f55f04fa38b51a469a035292232 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 16 Oct 2023 18:06:06 +0900 Subject: [PATCH 1/2] python311Packages.nbmerge: unstable-2017-10-23 -> 0.0.4 Diff: https://github.com/jbn/nbmerge/compare/fc0ba95e8422340317358ffec4404235defbc06a...v0.0.4 --- pkgs/development/python-modules/nbmerge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nbmerge/default.nix b/pkgs/development/python-modules/nbmerge/default.nix index 5919f7e18bf6..702429a58f84 100644 --- a/pkgs/development/python-modules/nbmerge/default.nix +++ b/pkgs/development/python-modules/nbmerge/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "nbmerge"; - version = "unstable-2017-10-23"; + version = "0.0.4"; src = fetchFromGitHub { owner = "jbn"; repo = pname; - rev = "fc0ba95e8422340317358ffec4404235defbc06a"; - sha256 = "1cn550kjadnxc1sx2xy814248fpzrj3lgvrmsbrwmk03vwaa2hmi"; + rev = "refs/tags/v${version}"; + hash = "sha256-Uqs/SO/AculHCFYcbjW08kLQX5GSU/eAwkN2iy/vhLM="; }; propagatedBuildInputs = [ nbformat ]; From 305c120f313c2bdc6013fd8ea4546e3b171d3b28 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 17 Oct 2023 14:35:00 +0900 Subject: [PATCH 2/2] python311Packages.nbmerge: refactor - add mainProgram to meta - add pythonImportsCheck - introduce `pyproject = true` - add runHook to checkPhase --- .../python-modules/nbmerge/default.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/development/python-modules/nbmerge/default.nix b/pkgs/development/python-modules/nbmerge/default.nix index 702429a58f84..6aaee680582c 100644 --- a/pkgs/development/python-modules/nbmerge/default.nix +++ b/pkgs/development/python-modules/nbmerge/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, setuptools , nbformat , nose }: @@ -8,6 +9,7 @@ buildPythonPackage rec { pname = "nbmerge"; version = "0.0.4"; + pyproject = true; src = fetchFromGitHub { owner = "jbn"; @@ -16,19 +18,33 @@ buildPythonPackage rec { hash = "sha256-Uqs/SO/AculHCFYcbjW08kLQX5GSU/eAwkN2iy/vhLM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ nbformat ]; + nativeCheckInputs = [ nose ]; checkPhase = '' + runHook preCheck + patchShebangs . nosetests -v PATH=$PATH:$out/bin ./cli_tests.sh + + runHook postCheck ''; + pythonImportsCheck = [ + "nbmerge" + ]; + meta = { description = "A tool to merge/concatenate Jupyter (IPython) notebooks"; inherit (src.meta) homepage; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; + mainProgram = "nbmerge"; }; }