From 67fa20c202018898200d8ce78e2ccb576a8e1d26 Mon Sep 17 00:00:00 2001 From: Sarah Clark Date: Sun, 8 Sep 2024 15:05:04 -0700 Subject: [PATCH] python312Packages.nbconflux: fix broken build by modernizing code --- .../python-modules/nbconflux/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/nbconflux/default.nix b/pkgs/development/python-modules/nbconflux/default.nix index 1de1a82ac6f1..f935b934b3cc 100644 --- a/pkgs/development/python-modules/nbconflux/default.nix +++ b/pkgs/development/python-modules/nbconflux/default.nix @@ -2,27 +2,32 @@ lib, buildPythonPackage, fetchFromGitHub, - isPy27, nbconvert, pytestCheckHook, requests, responses, + setuptools, + versioneer, }: buildPythonPackage rec { pname = "nbconflux"; version = "0.7.0"; - format = "setuptools"; - disabled = isPy27; # no longer compatible with python 2 urllib + pyproject = true; src = fetchFromGitHub { - owner = "Valassis-Digital-Media"; + owner = "vericast"; repo = "nbconflux"; rev = "refs/tags/${version}"; hash = "sha256-kHIuboFKLVsu5zlZ0bM1BUoQR8f1l0XWcaaVI9bECJw="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + versioneer + ]; + + dependencies = [ nbconvert requests ]; @@ -37,6 +42,11 @@ buildPythonPackage rec { ./setup-py.patch ]; + postPatch = '' + # remove vendorized versioneer.py + rm versioneer.py + ''; + JUPYTER_PATH = "${nbconvert}/share/jupyter"; disabledTests = [ "test_post_to_confluence"