From f4f6be1e9a12e0c9e71d1d960fc2cc7b56566ace Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 21 Jul 2023 14:31:19 +0200 Subject: [PATCH] python310Packages.nbconflux: fix build --- .../python-modules/nbconflux/default.nix | 9 +++++++-- .../python-modules/nbconflux/setup-py.patch | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/nbconflux/setup-py.patch diff --git a/pkgs/development/python-modules/nbconflux/default.nix b/pkgs/development/python-modules/nbconflux/default.nix index 2de84cf20ea..c986085a61e 100644 --- a/pkgs/development/python-modules/nbconflux/default.nix +++ b/pkgs/development/python-modules/nbconflux/default.nix @@ -16,14 +16,19 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Valassis-Digital-Media"; repo = "nbconflux"; - rev = version; - sha256 = "1708qkb275d6f7b4b5zmqx3i0jh56nrx2n9rwwp5nbaah5p2wwlh"; + rev = "refs/tags/${version}"; + hash = "sha256-kHIuboFKLVsu5zlZ0bM1BUoQR8f1l0XWcaaVI9bECJw="; }; propagatedBuildInputs = [ nbconvert requests ]; nativeCheckInputs = [ pytestCheckHook responses ]; + patches = [ + # The original setup.py file is missing commas in the install_requires list + ./setup-py.patch + ]; + JUPYTER_PATH="${nbconvert}/share/jupyter"; disabledTests = [ "test_post_to_confluence" diff --git a/pkgs/development/python-modules/nbconflux/setup-py.patch b/pkgs/development/python-modules/nbconflux/setup-py.patch new file mode 100644 index 00000000000..1e92e2dd11c --- /dev/null +++ b/pkgs/development/python-modules/nbconflux/setup-py.patch @@ -0,0 +1,16 @@ +diff --git a/setup.py b/setup.py +index 26f882d..b7ccf67 100644 +--- a/setup.py ++++ b/setup.py +@@ -27,8 +27,8 @@ setup( + ] + }, + install_requires=[ +- 'nbconvert>=5.3' +- 'requests' +- 'traitlets' ++ 'nbconvert>=5.3', ++ 'requests', ++ 'traitlets', + ], + )