Compare commits
No commits in common. "45a9ced99b0acbf73b15feccaf5538d4f5f56f0e" and "1cda1638c4cab9ee2a7dd15a30286dcdda804c86" have entirely different histories.
45a9ced99b
...
1cda1638c4
2 changed files with 8 additions and 19 deletions
8
lock.nix
8
lock.nix
|
@ -8,11 +8,11 @@
|
|||
sha256 = "sha256-o4FjFOUmjSRMK7dn0TFdAT0RRWUWD+WsspPHa+qEQT8=";
|
||||
};
|
||||
nixpkgs-unstable = {
|
||||
revision = "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7";
|
||||
sha256 = "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=";
|
||||
revision = "063dece00c5a77e4a0ea24e5e5a5bd75232806f8";
|
||||
sha256 = "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=";
|
||||
};
|
||||
cosmic-modules = {
|
||||
revision = "d20b15f629985fe6900925bef462f947e4a75b2f";
|
||||
sha256 = "sha256-KEuKL7lM2ZqKzvaGIptVDAce29CAR4ZSgWtFD3PnpB0=";
|
||||
revision = "14411c86d9af8e654e5a1608cc891e4e26f07b2f";
|
||||
sha256 = "sha256-TjRL6QnmOc3tXEJxkH/ThLem8R4g8YsGzAbvoDMW2Q4=";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -113,21 +113,10 @@ writeScript "den-http-get-updater" (''
|
|||
nixUnpack = lib.optionalString unpack "--unpack";
|
||||
nixName = lib.optionalString (!builtins.isNull name) "--name \"${lib.escapeShellArg name}\"";
|
||||
in ''
|
||||
for i in {{ 1..30 }}; do
|
||||
nixUrlsResult=$(nix-instantiate --eval --json --strict \
|
||||
"${prefetchUrlLocationShellEscape.file}" \
|
||||
-A "${prefetchUrlLocationShellEscape.attrpath}"
|
||||
)
|
||||
if [[ "$?" == "0" ]]; then
|
||||
break
|
||||
elif [[ "$i" == 30 ]]; then
|
||||
echo "error: prefetchUrlLocation failed - attempts exhausted" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
echo "prefetchUrlLocation failed (attempt $i)" 1>&2
|
||||
sleep 2
|
||||
done
|
||||
|
||||
|
||||
urlsType=$(jq -rc 'type' <<< "$nixUrlsResult")
|
||||
if [ "$urlsType" = "array" ]; then
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue