From c290358cad13fe10e56c83d7c2939ca15f8c34c7 Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 4 Oct 2024 04:56:20 +0000 Subject: [PATCH] feeds: remove the useless super-package: feeds can just be an ordinary attrset --- pkgs/by-name/feeds/package.nix | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/pkgs/by-name/feeds/package.nix b/pkgs/by-name/feeds/package.nix index cb10d5da3..5c8123aa5 100644 --- a/pkgs/by-name/feeds/package.nix +++ b/pkgs/by-name/feeds/package.nix @@ -3,14 +3,13 @@ newScope, sane-data, static-nix-shell, - symlinkJoin, - writeShellScript, }: lib.recurseIntoAttrs (lib.makeScope newScope (self: with self; { updateWithSuper = false; #< don't update feeds unless explicitly asked to by the user mkFeed = callPackage ./template.nix {}; + feed-pkgs = let byName = lib.mapAttrs (name: feed-details: mkFeed { @@ -20,26 +19,8 @@ lib.recurseIntoAttrs (lib.makeScope newScope (self: with self; { }) sane-data.feeds ; - in - symlinkJoin { - # this meta package exists primarily to link all the feed updaters - # into a single package which can *actually* be updated. - # it's not critical whether the actual package itself builds. - name = "feed-pkgs"; - pname = "feed-pkgs"; - version = "20230112"; - paths = builtins.attrValues byName; - passthru = byName // { - updateScript = let - update-all-feeds = writeShellScript "update-all-feeds" ( - lib.concatStringsSep "\n" ( - builtins.map (p: lib.concatStringsSep " " p.updateScript) (lib.attrValues byName) - ) - ); - in - [ update-all-feeds ]; - }; - }; + in lib.recurseIntoAttrs byName; + update-feed = static-nix-shell.mkPython3 { pname = "update"; srcRoot = ./.;