feeds: remove the useless super-package: feeds can just be an ordinary attrset
This commit is contained in:
@@ -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 = ./.;
|
||||
|
Reference in New Issue
Block a user