feat: simplify proviso

.github/workflows/std.yml

@@ -43,7 +43,7 @@ jobs:
           ) &&git add -f flake.lock)
           # continue normally ...
       - name: Standard Discovery
-        uses: divnix/std-action/discover@v0.23.0
+        uses: divnix/std-action/discover@main
         id: discovery
 
   build_cli:

src/std/fwlib/actions/build-proviso.sh

@@ -1,35 +1,47 @@
-function getUncachedDrvs {
-  local -a uncached
-  local drv
-  drv=$1
+declare action="$1"
+declare targetDrv
 
-  mapfile -t uncached < <(
-    command nix-store --realise --dry-run "$drv" 2>&1 1>/dev/null \
-    | command sed -nrf @extractor@
-  )
+eval "$(jq -r '@sh "targetDrv=\(.targetDrv)"' <<< "$action" )"
 
-  test ''${#uncached[@]} -eq 0 && return;
+mapfile -t uncached < <(
+  command nix-store --realise --dry-run "$targetDrv" 2>&1 1>/dev/null \
+  | command sed -nr '
+    # If the line "will be built" is matched ...
+    /will be built/ {
+        # Create a label to iterate over dervivations
+        :b
+    
+        # Get next line from input into pattern buffer
+        # (Overwrite the pattern buffer)
+        n
+    
+        # If the line matches a nix store path ...
+        /\/nix/ {
+    
+            # ... strip leading whitespaces and print it
+            s/\s*(.*)/\1/p
+    
+            # and go on with the next line (step back to b)     
+            bb
+        }
+    }
+  '
+)
 
-  if (
-     command nix show-derivation ''${uncached[@]} 2> /dev/null \
-     | command jq --exit-status \
-     ' with_entries(
-         select(.value|.env.preferLocalBuild != "1")
-       ) | any
-     ' 1> /dev/null
-  ); then
-    echo "$drv"
-  fi
-}
+if [[ ${#uncached[@]} -eq 0 ]];
+then
+  exit 1
+fi
 
-export -f getUncachedDrvs
+if ! (
+  command nix show-derivation ''${uncached[@]} 2> /dev/null \
+  | command jq --exit-status \
+  ' with_entries(
+      select(.value|.env.preferLocalBuild != "1")
+    ) | any
+  ' 1> /dev/null
+); then
+  exit 1
+fi
 
-command jq --raw-output \
-  --from-file @filter@ \
-  --arg uncachedDrvs "$(
-    parallel -j0 getUncachedDrvs ::: "$(
-       command jq --raw-output 'map(.targetDrv|strings)[]' <<< "$1"
-    )"
-  )" <<< "$1"
-
-unset -f getUncachedDrvs
+exit 0

src/std/fwlib/actions/build.nix

@@ -10,15 +10,7 @@ in
   currentSystem: target: let
     pkgs = nixpkgs.${currentSystem};
 
-    provisoDrv = pkgs.substituteAll {
-      src = ./build-proviso.sh;
-      filter = ./build-filter.jq;
-      extractor = ./build-uncached-extractor.sed;
-    };
-    proviso =
-      # toFile ensures it get's build
-      toFile provisoDrv.name
-      (readFile (toString provisoDrv));
+    proviso = ./build-proviso.sh;
 
     args = {
       targetDrv = target.drvPath;

src/std/fwlib/blockTypes/containers-proviso.sh

@@ -1,17 +1,10 @@
-function scopeo_inspect() {
-  local image
-  image="$1"
-  if command skopeo inspect --insecure-policy "docker://$image" &>/dev/null; then
-    echo "$image"
-  fi
-}
-export -f scopeo_inspect
-command jq --raw-output \
-  --from-file "@filter@" \
-  --arg available "$(
-    parallel -j0 scopeo_inspect ::: "$(
-       command jq --raw-output 'map(.meta.image|strings)[]' <<< "$1"
-    )"
-  )" <<< "$1"
-unset -f scopeo_inspect
-unset images
+declare action="$1"
+declare image
+
+eval "$(jq -r '@sh "image=\(.meta.image)"' <<< "$action" )"
+
+if command skopeo inspect --insecure-policy "docker://$image" &>/dev/null; then
+  echo 1
+fi
+
+echo 0

src/std/fwlib/blockTypes/containers.nix

@@ -29,15 +29,7 @@ in
     }: let
       inherit (inputs.n2c.packages.${currentSystem}) skopeo-nix2container;
       triv = trivial.${currentSystem};
-
-      provisoDrv = triv.substituteAll {
-        src = ./containers-proviso.sh;
-        filter = ./containers-publish-filter.jq;
-      };
-      proviso =
-        # toFile ensures it get's build
-        toFile provisoDrv.name
-        (readFile (toString provisoDrv));
+      proviso = ./containers-proviso.sh;
 
       tags' =
         builtins.toFile "${target.name}-tags.json" (builtins.concatStringsSep "\n" target.image.tags);

tests/_snapshots/bt-blocktypes

@@ -46,7 +46,7 @@
         command = <derivation build>;
         description = "build it";
         name = "build";
-        proviso = "/nix/store/wr33aaj6cq4w3apibizxfm76gczdsfhq-build-proviso.sh";
+        proviso = /nix/store/f10i6z9hwdr2adz7draay6v2jqv66swj-incl/std/fwlib/actions/build-proviso.sh;
         targetDrv = "drvPath";
       }
       {
@@ -61,7 +61,7 @@
           image = "repo:tag";
         };
         name = "publish";
-        proviso = "/nix/store/l4x9w3p106lrzh5ksk4k3zi3jdarf6zh-containers-proviso.sh";
+        proviso = /nix/store/f10i6z9hwdr2adz7draay6v2jqv66swj-incl/std/fwlib/blockTypes/containers-proviso.sh;
       }
       {
         command = <derivation load>;
@@ -94,7 +94,7 @@
         command = <derivation build>;
         description = "build it";
         name = "build";
-        proviso = "/nix/store/wr33aaj6cq4w3apibizxfm76gczdsfhq-build-proviso.sh";
+        proviso = /nix/store/f10i6z9hwdr2adz7draay6v2jqv66swj-incl/std/fwlib/actions/build-proviso.sh;
         targetDrv = "drvPath";
       }
       {
@@ -127,7 +127,7 @@
         command = <derivation build>;
         description = "build it";
         name = "build";
-        proviso = "/nix/store/wr33aaj6cq4w3apibizxfm76gczdsfhq-build-proviso.sh";
+        proviso = /nix/store/f10i6z9hwdr2adz7draay6v2jqv66swj-incl/std/fwlib/actions/build-proviso.sh;
         targetDrv = "drvPath";
       }
       {
@@ -280,7 +280,7 @@
         command = <derivation build>;
         description = "build it";
         name = "build";
-        proviso = "/nix/store/wr33aaj6cq4w3apibizxfm76gczdsfhq-build-proviso.sh";
+        proviso = /nix/store/f10i6z9hwdr2adz7draay6v2jqv66swj-incl/std/fwlib/actions/build-proviso.sh;
         targetDrv = "drvPath";
       }
       {