fix pkgs.feeds update scripts

flake.nix

@@ -256,17 +256,21 @@
             # let the user handle that edge case by re-running this whole command
             nixos-rebuild --flake '.#${host}' ${action} --target-host colin@${addr} --use-remote-sudo $@
           '';
+
+          # pkg updating.
+          # a cleaner alternative lives here: <https://discourse.nixos.org/t/how-can-i-run-the-updatescript-of-personal-packages/25274/2>
           mkUpdater = attrPath: {
             type = "app";
             program = let
               pkg = pkgs.lib.getAttrFromPath attrPath sanePkgs;
               strAttrPath = pkgs.lib.concatStringsSep "." attrPath;
-            in builtins.toString (pkgs.writeShellScript "update-${pkg.name}" ''
+              command = pkgs.lib.escapeShellArgs pkg.updateScript.command;
+            in builtins.toString (pkgs.writeShellScript "update-${strAttrPath}" ''
               export UPDATE_NIX_NAME=${pkg.name}
               export UPDATE_NIX_PNAME=${pkg.pname}
               export UPDATE_NIX_OLD_VERSION=${pkg.version}
               export UPDATE_NIX_ATTR_PATH=${strAttrPath}
-              ${pkgs.lib.escapeShellArgs pkg.updateScript.command}
+              ${command}
             '');
           };
           mkUpdatersNoAliases = basePath: pkgs.lib.concatMapAttrs
@@ -283,30 +287,23 @@
               updaters = mkUpdatersNoAliases basePath;
               invokeUpdater = name: pkg:
                 let
-                  subUpdater =
+                  # in case `name` has a `.` in it, we have to quote it
-                    if pkg.type or "" == "app" then
+                  escapedPath = builtins.map (p: ''"${p}"'') (basePath ++ [ name ]);
-                      # simple package
+                  updatePath = builtins.concatStringsSep "." ([ "update" "pkgs" ] ++ escapedPath);
-                      basePath ++ [ name ]
+                in pkgs.lib.escapeShellArgs [
-                    else if (pkg.all or {}).type or "" == "app" then
+                  "nix" "run" ".#${updatePath}"
-                      # package group
+                ];
-                      basePath ++ [ name "all" ]
-                    else null;  # possibly a collection which can't be updated as one.
-                  updatePath = builtins.concatStringsSep "." ([ "update" "pkgs" ] ++ subUpdater);
-                in pkgs.lib.optionalString (subUpdater != null) (
-                  "nix run '.#${updatePath}'"
-              );
             in {
-              all = {
+              #all = {
                 type = "app";
                 program = builtins.toString (pkgs.writeShellScript
-                  "update-${builtins.concatStringsSep "-" basePath}"
+                  (builtins.concatStringsSep "-" (["update"] ++ basePath))
-                  (
+                  (builtins.concatStringsSep
-                    builtins.concatStringsSep
+                    "\n"
-                      "\n"
+                    (pkgs.lib.mapAttrsToList invokeUpdater updaters)
-                      (pkgs.lib.mapAttrsToList invokeUpdater updaters)
+                  )
-                      )
                 );
-              };
+              #};
             } // updaters;
         in {
           help = {
@@ -316,10 +313,10 @@
                 commands:
                 - `nix run '.#help'`
                   - show this message
-                - `nix run '.#update.feeds'`
+                - `nix run '.#update.pkgs'`
+                  - updates every package
+                - `nix run '.#update.pkgs.feeds'`
                   - updates metadata for all feeds
-                - `nix run '.#update.pkgs.firefox-extensions.unwrapped.bypass-paywalls-clean'`
-                  - runs the `updateScript` for the corresponding pkg, if it has one
                 - `nix run '.#init-feed' <url>`
                 - `nix run '.#deploy-{lappy,moby,moby-test,servo}' [nixos-rebuild args ...]`
                 - `nix run '.#check-nur'`
@@ -328,16 +325,11 @@
               cat ${helpMsg}
             '');
           };
-          update.feeds = {
-            type = "app";
-            program = "${pkgs.feeds.updateScript}";
-          };
-
           update.pkgs = mkUpdaters [];
 
           init-feed = {
             type = "app";
-            program = "${pkgs.feeds.initFeedScript}";
+            program = "${pkgs.feeds.init-feed}";
           };
 
           deploy-lappy = {

pkgs/additional/feeds/default.nix

@@ -1,27 +1,22 @@
 { lib
-, callPackage
+, newScope
 , python3
 , sane-data
 , static-nix-shell
 , writeShellScript
 }:
 
-let
+lib.makeScope newScope (self: with self; {
-  # TODO: dependency-inject this.
+  mkFeed = callPackage ./template.nix {};
-  template = callPackage ./template.nix;
+  feed-pkgs = lib.recurseIntoAttrs (lib.mapAttrs
-  feed-pkgs' = lib.mapAttrs
+    (name: feed-details: mkFeed {
-    (name: feed-details: template {
       feedName = name;
       jsonPath = "modules/data/feeds/sources/${name}/default.json";
       inherit (feed-details) url;
     })
-    sane-data.feeds;
+    sane-data.feeds
-  update-scripts = lib.mapAttrsToList
+  );
-    (name: feed: builtins.concatStringsSep " " feed.passthru.updateScript)
+  update-feed = static-nix-shell.mkPython3Bin {
-    feed-pkgs';
-in rec {  # TODO: make this a scope
-  feed-pkgs = lib.recurseIntoAttrs feed-pkgs';
-  update = static-nix-shell.mkPython3Bin {
     pname = "update";
     src = ./.;
     pyPkgs = [ "feedsearch-crawler" ];
@@ -46,12 +41,7 @@ in rec {  # TODO: make this a scope
       # but in a way where the least could go wrong.
       pushd "$sources_dir"; mkdir -p "$name"; popd
 
-      ${update}/bin/update.py "$name" "$json_path"
+      ${update-feed}/bin/update.py "$name" "$json_path"
       cat "$json_path"
     '';
-
+})
-  updateScript = writeShellScript
-    "feeds-update"
-    (builtins.concatStringsSep "\n" update-scripts);
-  initFeedScript = init-feed;
-}

pkgs/additional/feeds/template.nix

@@ -1,20 +1,22 @@
 { lib
 , stdenv
-, callPackage
 , fetchurl
-# feed-specific args
+, update-feed
-, feedName
-, jsonPath
-, url
 }:
 
+# feed-specific args
+{ feedName, jsonPath, url }:
+
 stdenv.mkDerivation {
   pname = feedName;
   version = "20230112";
   src = fetchurl {
     inherit url;
   };
-  passthru.updateScript = [ ./update.py url jsonPath ];
+  passthru.updateScript = {
+    name = "feed-update-script";
+    command = [ "${update-feed}/bin/update.py" url jsonPath ];
+  };
   meta = {
     description = "metadata about any feeds available at ${feedName}";
     homepage = feedName;