From 80cb27a6186199dba8a723f4c2710794de992561 Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Wed, 9 Apr 2025 12:54:16 +0200 Subject: [PATCH 1/2] pkgs/den-http-get-updater: try evaluate urlLocation multiple times --- .../de/den-http-get-updater/package.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/de/den-http-get-updater/package.nix b/pkgs/by-name/de/den-http-get-updater/package.nix index 484fa35..106451a 100644 --- a/pkgs/by-name/de/den-http-get-updater/package.nix +++ b/pkgs/by-name/de/den-http-get-updater/package.nix @@ -113,10 +113,21 @@ writeScript "den-http-get-updater" ('' nixUnpack = lib.optionalString unpack "--unpack"; nixName = lib.optionalString (!builtins.isNull name) "--name \"${lib.escapeShellArg name}\""; in '' - nixUrlsResult=$(nix-instantiate --eval --json --strict \ - "${prefetchUrlLocationShellEscape.file}" \ - -A "${prefetchUrlLocationShellEscape.attrpath}" - ) + 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 From 45a9ced99b0acbf73b15feccaf5538d4f5f56f0e Mon Sep 17 00:00:00 2001 From: Wroclaw Date: Wed, 9 Apr 2025 12:54:27 +0200 Subject: [PATCH 2/2] lock: update --- lock.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lock.nix b/lock.nix index 90657f6..b11d9d3 100644 --- a/lock.nix +++ b/lock.nix @@ -8,11 +8,11 @@ sha256 = "sha256-o4FjFOUmjSRMK7dn0TFdAT0RRWUWD+WsspPHa+qEQT8="; }; nixpkgs-unstable = { - revision = "063dece00c5a77e4a0ea24e5e5a5bd75232806f8"; - sha256 = "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE="; + revision = "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7"; + sha256 = "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA="; }; cosmic-modules = { - revision = "14411c86d9af8e654e5a1608cc891e4e26f07b2f"; - sha256 = "sha256-TjRL6QnmOc3tXEJxkH/ThLem8R4g8YsGzAbvoDMW2Q4="; + revision = "d20b15f629985fe6900925bef462f947e4a75b2f"; + sha256 = "sha256-KEuKL7lM2ZqKzvaGIptVDAce29CAR4ZSgWtFD3PnpB0="; }; }