From 66bfeade069750649f14d0e4fa7cefaafaac1a01 Mon Sep 17 00:00:00 2001 From: emily Date: Wed, 11 Sep 2024 22:17:48 +0200 Subject: [PATCH] fix: attic inputs and update-nixfiles --- flake.nix | 1 - pkgs/update-nixfiles/update-nixfiles.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 1f19e5e..a1573dd 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,6 @@ attic = { url = "github:zhaofengli/attic"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; }; disko = { url = "github:nix-community/disko"; diff --git a/pkgs/update-nixfiles/update-nixfiles.sh b/pkgs/update-nixfiles/update-nixfiles.sh index baeeec6..dc7721f 100644 --- a/pkgs/update-nixfiles/update-nixfiles.sh +++ b/pkgs/update-nixfiles/update-nixfiles.sh @@ -42,7 +42,7 @@ wait_for_hydra () { local hydra_rev local counter counter=0 - git_rev="$(gitin rev-parse update-inputs)" + git_rev="$(git -C "${ROOT}/nixfiles" rev-parse update-inputs)" while true; do hydra_rev="$(curl -s -L -H "Accept: application/json" "${JOBSET_URL}/latest-eval" | jq -r .flake | sed -E "s/.+&rev=(.*)/\1/g")" if [[ "${git_rev}" == "${hydra_rev}" ]]; then