Skip to content

python311Packages.sphinxcontrib_newsfeed: fix build #264924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dotlambda wants to merge 2 commits into from
Closed

python311Packages.sphinxcontrib_newsfeed: fix build #264924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1a3a82
python311Packages.sphinxcontrib_newsfeed: fix build
dotlambda Nov 2, 2023
15f0d27
python311Packages.sphinxcontrib-newsfeed: rename from sphinxcontrib_n…
dotlambda Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/applications/misc/khal/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec {
] ++ (with python3.pkgs; [
setuptools-scm
sphinx
sphinxcontrib_newsfeed
sphinxcontrib-newsfeed
]);

propagatedBuildInputs = with python3.pkgs;[
Expand Down Expand Up @@ -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

Expand Down
15 changes: 14 additions & 1 deletion ...odules/sphinxcontrib_newsfeed/default.nix → ...odules/sphinxcontrib-newsfeed/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,32 @@
{ lib
, buildPythonPackage
, fetchPypi
, setuptools
, docutils
, sphinx
}:

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";
Expand Down
1 change: 1 addition & 0 deletions pkgs/top-level/python-aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/python-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };

Expand Down