refactor: simplify proviso

Author: blaggacao

src/actions.nix

@@ -17,31 +17,27 @@
         l.toFile "build-proviso"
         # bash
         ''
-          function proviso() {
-            local -n input=$1
-            local -n output=$2
-
-            local drvs
-            local -a uncached
-
-            # FIXME: merge upstream to avoid any need for runtime context
-            command nix build github:divnix/nix-uncached/v2.13.1
-
-            drvs=$(command jq -r '.targetDrv | select(. != "null")' <<< "''${input[@]}")
-
-            uncached_json=$(result/bin/nix-uncached $drvs)
-
-            mapfile -t uncached < <(command jq -r 'to_entries[]|select(.value != [])|.key' <<< "$uncached_json")
-
-            if [[ -n ''${uncached[*]} ]]; then
-              local list filtered
-
-              list=$(command jq -ncR '[inputs]' <<< "''${uncached[@]}")
-              filtered=$(command jq -c 'select([.targetDrv] | inside($p))' --argjson p "$list" <<< "''${input[@]}")
-
-              output=$(command jq -cs '. += $p' --argjson p "$output" <<< "$filtered")
-            fi
-          }
+          # FIXME: merge upstream to avoid any need for runtime context
+          command nix build github:divnix/nix-uncached/v2.13.1
+
+          local -a drvs
+          eval "$(
+            command jq --raw-output '
+              "drvs=(\(map(.targetDrv|strings)|@sh))"
+            ' <<< "$1"
+          )"
+
+          command jq --raw-output \
+            --argjson checked "$(./result/bin/nix-uncached ''${drvs[@]})" \
+          ' (
+              $checked | with_entries(select(.value == [])) | keys
+            ) as $cached
+            | map(select(
+              [.targetDrv] | IN($cached) | not
+            ))
+          ' <<< "$1"
+
+          unset drvs
         '';
     };
 

src/blocktypes/containers.nix

@@ -69,11 +69,33 @@
           ${copyFn}
           copy docker://${img}
         '';
+        meta.images = map (tag: "${img}:${tag}") tags;
         proviso = l.toFile "container-proviso" ''
-          SKOPEO_INSPECT=${./proviso/skopeo-inspect.sh}
-          ${builtins.readFile ./proviso/publish.sh}
+          function scopeo_inspect() {
+            local images=("$@")
+            for image in ''${images[@]}; do
+               if command &>/dev/null skopeo inspect --insecure-policy "docker://$image"; then
+                 echo "$image"
+               fi
+            done
+          }
+
+          declare -a images
+          eval "$(
+            command jq --raw-output '
+              "images=(\(map(.meta.images[0]|strings)|@sh))"
+            ' <<< "$1"
+          )"
+
+          command jq --raw-output \
+            --arg available "$(scopeo_inspect ''${images[@]})" \
+          ' map(select(
+              .meta.images[0] | inside($available) | not
+            ))
+          ' <<< "$1"
+
+          unset images
         '';
-        meta.images = map (tag: "${img}:${tag}") tags;
       })
       (mkCommand currentSystem {
         name = "load";