From 7188cd2a6b9b0b1b9c378ea8efe9f505a83257fe Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Tue, 24 Mar 2026 19:07:15 +0100 Subject: [PATCH 1/3] python3Packages.sphinxfeed-lsaffre: init at 0.3.6 This is a new dependency of khal. The package was almost completely generated via `nix-init`. --- .../sphinxfeed-lsaffre/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/sphinxfeed-lsaffre/default.nix diff --git a/pkgs/development/python-modules/sphinxfeed-lsaffre/default.nix b/pkgs/development/python-modules/sphinxfeed-lsaffre/default.nix new file mode 100644 index 000000000000..1bddcab744a7 --- /dev/null +++ b/pkgs/development/python-modules/sphinxfeed-lsaffre/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + feedgen, + python-dateutil, + sphinx, + pytestCheckHook, + pytest-cov-stub, +}: + +buildPythonPackage (finalAttrs: { + pname = "sphinxfeed-lsaffre"; + version = "0.3.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "lsaffre"; + repo = "sphinxfeed"; + tag = "v${finalAttrs.version}"; + hash = "sha256-2hS8EzaUlxAqBT0R5NMYAuj3ZMPq+x5nqJnidQOAGfM="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + feedgen + python-dateutil + sphinx + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-cov-stub + ]; + + pythonImportsCheck = [ + "sphinxfeed" + ]; + + meta = { + description = "Automatically generates an RSS feed when a build is run"; + homepage = "https://github.com/lsaffre/sphinxfeed"; + changelog = "https://github.com/lsaffre/sphinxfeed/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.antonmosich ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bffdd977ba0f..07742139e40a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18280,6 +18280,8 @@ self: super: with self; { sphinxext-rediraffe = callPackage ../development/python-modules/sphinxext-rediraffe { }; + sphinxfeed-lsaffre = callPackage ../development/python-modules/sphinxfeed-lsaffre { }; + spiderpy = callPackage ../development/python-modules/spiderpy { }; spidev = callPackage ../development/python-modules/spidev { }; From 7d0d42afb8ddbbc60e00294b5baed2ea0de0ca84 Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Tue, 24 Mar 2026 19:07:39 +0100 Subject: [PATCH 2/3] khal: 0.13.0 -> 0.14.0 Changelog: https://khal.readthedocs.io/en/v0.14.0/changelog.html#id2 --- pkgs/by-name/kh/khal/package.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/kh/khal/package.nix b/pkgs/by-name/kh/khal/package.nix index b9484eeaf8e0..f7fe9c68e474 100644 --- a/pkgs/by-name/kh/khal/package.nix +++ b/pkgs/by-name/kh/khal/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, glibcLocales, installShellFiles, python3Packages, @@ -11,25 +10,16 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "khal"; - version = "0.13.0"; + version = "0.14.0"; pyproject = true; src = fetchFromGitHub { owner = "pimutils"; repo = "khal"; tag = "v${finalAttrs.version}"; - hash = "sha256-pbBdScyYQMdT2NjCk2dKPkR75Zcizzco2IkXpHkgPR8="; + hash = "sha256-ltb2c9p/kD0PtYnLxRIm/SNlg+W+Vca6JSA7BahZ9uQ="; }; - patches = [ - # https://github.com/pimutils/khal/pull/1418/ - (fetchpatch { - name = "fix_calendar_popup"; - url = "https://github.com/pimutils/khal/commit/3fadf020bb65c9c95bba46b5d3695c2565cceacd.patch"; - hash = "sha256-KhqP0RLLOXm1d/4rCVAb5f7v0q7N0/U2iM23+TcnJhY="; - }) - ]; - build-system = with python3Packages; [ setuptools setuptools-scm @@ -40,7 +30,7 @@ python3Packages.buildPythonApplication (finalAttrs: { installShellFiles sphinxHook python3Packages.sphinx-rtd-theme - python3Packages.sphinxcontrib-newsfeed + python3Packages.sphinxfeed-lsaffre ]; dependencies = with python3Packages; [ From f5f373074c0d323d288b0eecc16034ecf490df7b Mon Sep 17 00:00:00 2001 From: Anton Mosich Date: Tue, 24 Mar 2026 22:42:43 +0100 Subject: [PATCH 3/3] python3Packages.sphinxcontrib-newsfeed: drop The package has last been touched upstream in 2020, and it's not compatible with sphinx 9.1. It is no longer consumed in nixpkgs by anything, allowing it to be dropped. --- .../sphinxcontrib-newsfeed/default.nix | 35 ------------------- .../fix-for-sphinx-9.1.patch | 16 --------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 4 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 pkgs/development/python-modules/sphinxcontrib-newsfeed/default.nix delete mode 100644 pkgs/development/python-modules/sphinxcontrib-newsfeed/fix-for-sphinx-9.1.patch diff --git a/pkgs/development/python-modules/sphinxcontrib-newsfeed/default.nix b/pkgs/development/python-modules/sphinxcontrib-newsfeed/default.nix deleted file mode 100644 index 1badf4ca4d48..000000000000 --- a/pkgs/development/python-modules/sphinxcontrib-newsfeed/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - setuptools, - sphinx, -}: - -buildPythonPackage rec { - pname = "sphinxcontrib-newsfeed"; - version = "0.1.4"; - pyproject = true; - - src = fetchPypi { - inherit pname version; - sha256 = "1d7gam3mn8v4in4p16yn3v10vps7nnaz6ilw99j4klij39dqd37p"; - }; - - patches = [ - # reference: https://github.com/prometheusresearch/sphinxcontrib-newsfeed/pull/7 - ./fix-for-sphinx-9.1.patch - ]; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ sphinx ]; - - pythonNamespaces = [ "sphinxcontrib" ]; - - meta = { - description = "Extension for adding a simple Blog, News or Announcements section to a Sphinx website"; - homepage = "https://github.com/prometheusresearch/sphinxcontrib-newsfeed"; - license = lib.licenses.bsd2; - }; -} diff --git a/pkgs/development/python-modules/sphinxcontrib-newsfeed/fix-for-sphinx-9.1.patch b/pkgs/development/python-modules/sphinxcontrib-newsfeed/fix-for-sphinx-9.1.patch deleted file mode 100644 index ce6e841a708e..000000000000 --- a/pkgs/development/python-modules/sphinxcontrib-newsfeed/fix-for-sphinx-9.1.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/sphinxcontrib/newsfeed.py b/sphinxcontrib/newsfeed.py -index 2e155cd..64b30d9 100644 ---- a/sphinxcontrib/newsfeed.py -+++ b/sphinxcontrib/newsfeed.py -@@ -265,8 +265,9 @@ def process_feed(app, doctree, fromdocname): - replacement.append(section_node) - env.resolve_references(rss_item_description, docname, app.builder) - if app.builder.format == 'html': -- rss_item_description = app.builder.render_partial( -- rss_item_description)['body'] -+ rendered = app.builder.render_partial(rss_item_description) -+ # Sphinx 9.1+ changed 'body' to 'fragment' -+ rss_item_description = rendered.get('fragment', rendered.get('body', '')) - rss_item_date = meta['date'] - rss_item = RSSItem(rss_item_title, rss_item_link, - rss_item_description, rss_item_date) diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 4e908bb2838f..ec00adf12f0b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -529,6 +529,7 @@ mapAliases { sphinx-version-warning = throw "'sphinx-version-warning' has been abandoned upstream in 2019"; # Added 2026-01-18 sphinx_rtd_theme = throw "'sphinx_rtd_theme' has been renamed to/replaced by 'sphinx-rtd-theme'"; # Converted to throw 2025-10-29 sphinxcontrib-autoapi = throw "'sphinxcontrib-autoapi' has been renamed to/replaced by 'sphinx-autoapi'"; # Converted to throw 2025-10-29 + sphinxcontrib-newsfeed = throw "'sphinxcontrib-newsfeed has been removed due to abandonment upstream"; # Added 2026-03-24 sphinxcontrib_httpdomain = throw "'sphinxcontrib_httpdomain' has been renamed to/replaced by 'sphinxcontrib-httpdomain'"; # Converted to throw 2025-10-29 sphinxcontrib_newsfeed = throw "'sphinxcontrib_newsfeed' has been renamed to/replaced by 'sphinxcontrib-newsfeed'"; # Converted to throw 2025-10-29 sphinxcontrib_plantuml = throw "'sphinxcontrib_plantuml' has been renamed to/replaced by 'sphinxcontrib-plantuml'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 07742139e40a..89c7e9406dd1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18238,8 +18238,6 @@ self: super: with self; { inherit (pkgs) mscgen; }; - sphinxcontrib-newsfeed = callPackage ../development/python-modules/sphinxcontrib-newsfeed { }; - sphinxcontrib-nwdiag = callPackage ../development/python-modules/sphinxcontrib-nwdiag { }; sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { };