diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 271d571a5314d..a8de9a4ddec85 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { ] ++ (with python3.pkgs; [ setuptools-scm sphinx - sphinxcontrib_newsfeed + sphinxcontrib-newsfeed ]); propagatedBuildInputs = with python3.pkgs;[ @@ -62,7 +62,7 @@ python3.pkgs.buildPythonApplication rec { --fish <(_KHAL_COMPLETE=fish_source $out/bin/khal) # man page - PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib_newsfeed ])}/bin:$PATH" \ + PATH="${python3.withPackages (ps: with ps; [ sphinx sphinxcontrib-newsfeed ])}/bin:$PATH" \ make -C doc man installManPage doc/build/man/khal.1 diff --git a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix b/pkgs/development/python-modules/sphinxcontrib-newsfeed/default.nix similarity index 71% rename from pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix rename to pkgs/development/python-modules/sphinxcontrib-newsfeed/default.nix index a298025f8ba3b..694cbe77baca1 100644 --- a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-newsfeed/default.nix @@ -1,6 +1,8 @@ { lib , buildPythonPackage , fetchPypi +, setuptools +, docutils , sphinx }: @@ -8,12 +10,23 @@ buildPythonPackage rec { pname = "sphinxcontrib-newsfeed"; version = "0.1.4"; + pyproject = true; + src = fetchPypi { inherit pname version; sha256 = "1d7gam3mn8v4in4p16yn3v10vps7nnaz6ilw99j4klij39dqd37p"; }; - propagatedBuildInputs = [ sphinx ]; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + docutils + sphinx + ]; + + pythonImportsCheck = [ "sphinxcontrib.newsfeed" ]; meta = with lib; { description = "Extension for adding a simple Blog, News or Announcements section to a Sphinx website"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5357761aa23f0..9fa6fa8da362a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -391,6 +391,7 @@ mapAliases ({ sphinx_pypi_upload = throw "sphinx_pypi_upload has been removed since it is abandoned."; # added 2023-10-11 sphinx_rtd_theme = sphinx-rtd-theme; # added 2022-08-03 sphinxcontrib-autoapi = sphinx-autoapi; # added 2023-02=28 + sphinxcontrib_newsfeed = sphinxcontrib-newsfeed; # added 2023-11-01 sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02 sphinx-navtree = throw "sphinx-navtree has been removed since it is not compatible with sphinx 3.3 and unmaintained"; # added 2023-07-03 sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 73bd3bb17c1f1..a9cec12254da8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13219,7 +13219,7 @@ self: super: with self; { sphinxcontrib-nwdiag = callPackage ../development/python-modules/sphinxcontrib-nwdiag { }; - sphinxcontrib_newsfeed = callPackage ../development/python-modules/sphinxcontrib_newsfeed { }; + sphinxcontrib-newsfeed = callPackage ../development/python-modules/sphinxcontrib-newsfeed { }; sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { };