Compare commits

..

No commits in common. "3e999878c2dc8a11ec8d914ff20de4c64007b3f8" and "cc61437fc100bea790acd82e145bfb1bd7e49f08" have entirely different histories.

2 changed files with 8 additions and 9 deletions

View file

@ -4,19 +4,19 @@
sha256 = "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY="; sha256 = "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY=";
}; };
nixpkgs = { nixpkgs = {
revision = "5b35d248e9206c1f3baf8de6a7683fee126364aa"; revision = "bf3287dac860542719fe7554e21e686108716879";
sha256 = "sha256-NTtKOTLQv6dPfRe00OGSywg37A1FYqldS6xiNmqBUYc="; sha256 = "sha256-kwaaguGkAqTZ1oK0yXeQ3ayYjs8u/W7eEfrFpFfIDFA=";
}; };
nixpkgs-unstable = { nixpkgs-unstable = {
revision = "979daf34c8cacebcd917d540070b52a3c2b9b16e"; revision = "f02fddb8acef29a8b32f10a335d44828d7825b78";
sha256 = "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw="; sha256 = "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=";
}; };
nix-bitcoin = { nix-bitcoin = {
revision = "990805aa7c7fcd1552c6e14e8c6df9a88ba9be41"; revision = "990805aa7c7fcd1552c6e14e8c6df9a88ba9be41";
sha256 = "sha256-yU7iYlDSD8lOrm02igxIl3y+bXGZDDO0qcG0gO48Cto="; sha256 = "sha256-yU7iYlDSD8lOrm02igxIl3y+bXGZDDO0qcG0gO48Cto=";
}; };
cosmic-modules = { cosmic-modules = {
revision = "31f862a4aa17bc24276521e375ac20b531735ee9"; revision = "9ee103c0e4c46ed36ed51c349d499581801d9d6e";
sha256 = "sha256-mrIce0ToyjtuhNYSEA+3KB5C2eUNpmK7g1DuqP4L+x0="; sha256 = "sha256-nFvPap4+GVkcWXMQhuscuZt1t/mnNOKoYZ/a66rr1Xg=";
}; };
} }

View file

@ -5,7 +5,6 @@
gnused, gnused,
jq, jq,
nix, nix,
uutils-coreutils-noprefix,
writeScript, writeScript,
}: }:
@ -114,7 +113,7 @@ writeScript "den-http-get-updater" (''
nixUnpack = lib.optionalString unpack "--unpack"; nixUnpack = lib.optionalString unpack "--unpack";
nixName = lib.optionalString (!builtins.isNull name) "--name \"${lib.escapeShellArg name}\""; nixName = lib.optionalString (!builtins.isNull name) "--name \"${lib.escapeShellArg name}\"";
in '' in ''
for i in {1..30}; do for i in {{ 1..30 }}; do
nixUrlsResult=$(nix-instantiate --eval --json --strict \ nixUrlsResult=$(nix-instantiate --eval --json --strict \
"${prefetchUrlLocationShellEscape.file}" \ "${prefetchUrlLocationShellEscape.file}" \
-A "${prefetchUrlLocationShellEscape.attrpath}" -A "${prefetchUrlLocationShellEscape.attrpath}"
@ -126,7 +125,7 @@ in ''
exit 1 exit 1
fi fi
echo "prefetchUrlLocation failed (attempt $i)" 1>&2 echo "prefetchUrlLocation failed (attempt $i)" 1>&2
${lib.getExe' uutils-coreutils-noprefix "sleep"} 2 sleep 2
done done