From 014bf43b9436da0669521689f4ddd42574104521 Mon Sep 17 00:00:00 2001 From: pinage404 Date: Sun, 16 Aug 2026 18:44:36 +0200 Subject: [PATCH 1/2] mdbook-rss-feed: tell the difference with the full package --- pkgs/by-name/md/mdbook-rss-feed/package.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/md/mdbook-rss-feed/package.nix b/pkgs/by-name/md/mdbook-rss-feed/package.nix index b81570373590..f7ed2edf6d8b 100644 --- a/pkgs/by-name/md/mdbook-rss-feed/package.nix +++ b/pkgs/by-name/md/mdbook-rss-feed/package.nix @@ -7,6 +7,11 @@ withJsonFeed ? false, }: +let + buildFeatures = lib.optional withAtom "atom" ++ lib.optional withJsonFeed "json-feed"; + hasOptionalFeatures = buildFeatures != [ ]; + withOptionalFeatures = lib.optionalString hasOptionalFeatures " with ${lib.strings.concatStringsSep " and " buildFeatures} features"; +in rustPlatform.buildRustPackage (finalAttrs: { pname = "mdbook-rss-feed"; version = "1.8.1"; @@ -21,12 +26,13 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-UkoNcwEq2Ga3PEF04Xly++VdBekdCBKSHggIGXjTMXU="; - buildFeatures = lib.optional withAtom [ "atom" ] ++ lib.optional withJsonFeed [ "json-feed" ]; + inherit buildFeatures; passthru.updateScript = nix-update-script { }; meta = { - description = "mdBook preprocessor that generates a full-content RSS 2.0 feed"; + description = + "mdBook preprocessor that generates a full-content RSS 2.0 feed" + withOptionalFeatures; homepage = "https://github.com/saylesss88/mdbook-rss-feed"; changelog = "https://github.com/saylesss88/mdbook-rss-feed/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.asl20; From 36a95019eda51d4a9951673d2de621b9e9b2916f Mon Sep 17 00:00:00 2001 From: pinage404 Date: Sun, 16 Aug 2026 19:01:34 +0200 Subject: [PATCH 2/2] mdbook-rss-feed: refactor: move from `all-packages` to `pkgs/by-name` inspired by the curl package --- pkgs/by-name/md/mdbook-rss-feed-full/package.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 5 ----- 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 pkgs/by-name/md/mdbook-rss-feed-full/package.nix diff --git a/pkgs/by-name/md/mdbook-rss-feed-full/package.nix b/pkgs/by-name/md/mdbook-rss-feed-full/package.nix new file mode 100644 index 000000000000..e6ac78ecd07e --- /dev/null +++ b/pkgs/by-name/md/mdbook-rss-feed-full/package.nix @@ -0,0 +1,12 @@ +{ + mdbook-rss-feed, + ... +}@args: + +mdbook-rss-feed.override ( + { + withAtom = true; + withJsonFeed = true; + } + // removeAttrs args [ "mdbook-rss-feed" ] +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d619cc5bc579..0d9dfb171ffc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7331,11 +7331,6 @@ with pkgs; inherit (mailmanPackages) mailman mailman-hyperkitty; mailman-web = mailmanPackages.web; - mdbook-rss-feed-full = mdbook-rss-feed.override { - withAtom = true; - withJsonFeed = true; - }; - micro-full = micro.wrapper.override { extraPackages = [ wl-clipboard