khal: 0.13.0 -> 0.14.0 (#503114)

2026-03-24 23:02:57 +00:00
parent b94e684769 f5f373074c
commit aa55836209
6 changed files with 57 additions and 66 deletions
@@ -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; [
@@ -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;
-  };
-}
@@ -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)
@@ -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 ];
+  };
+})
@@ -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
@@ -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 { };
@@ -18280,6 +18278,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 { };