diff --git a/config/hosts/florp/configuration.nix b/config/hosts/florp/configuration.nix index 375d9c5..fd06c11 100644 --- a/config/hosts/florp/configuration.nix +++ b/config/hosts/florp/configuration.nix @@ -31,7 +31,7 @@ backupPrepareCommand = '' umask 0077 rm -f -- ${pgBackup} - su -c '${lib.getExe' config.services.postgresql.package "pg_dumpall"}' \ + ${pkgs.su}/bin/su -c '${lib.getExe' config.services.postgresql.package "pg_dumpall"}' \ ${config.services.postgresql.superUser} >${pgBackup} ''; diff --git a/flake.lock b/flake.lock index 17ea0df..2389220 100644 --- a/flake.lock +++ b/flake.lock @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1731060864, - "narHash": "sha256-aYE7oAYZ+gPU1mPNhM0JwLAQNgjf0/JK1BF1ln2KBgk=", + "lastModified": 1731274291, + "narHash": "sha256-cZ0QMpv5p2a6WEE+o9uu0a4ma6RzQDOQTbm7PbixWz8=", "owner": "nix-community", "repo": "disko", - "rev": "5e40e02978e3bd63c2a6a9fa6fa8ba0e310e747f", + "rev": "486250f404f4a4f4f33f8f669d83ca5f6e6b7dfc", "type": "github" }, "original": { @@ -437,11 +437,11 @@ ] }, "locked": { - "lastModified": 1731187545, - "narHash": "sha256-n/BOlXvOcX5yn2mbjazfCcbojzczCdmcjQNaH7Dcdd4=", + "lastModified": 1731279732, + "narHash": "sha256-eZllHPzbjvTNrzImqtDrs0k1LsIIeTlp8MMN9SxMvvE=", "ref": "refs/heads/main", - "rev": "1845276697adca236be3e7a983238d2a2d0d57b5", - "revCount": 7, + "rev": "2f1130b23576a403b9b1d70d6431649bfa044621", + "revCount": 8, "type": "git", "url": "https://woof.rip/florp/about.git" }, @@ -977,11 +977,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1731155487, - "narHash": "sha256-+D57j7BcV5O3XH9za3c3XXVLHr+F+enThAN2EeF6H/M=", + "lastModified": 1731281996, + "narHash": "sha256-xdNFY/wcs8i9qluVbTAVh5JLlhI/r4JJfXb0yfEj1Ks=", "owner": "nix-community", "repo": "nixvim", - "rev": "31364af1990067d5529846a2ebf17a42c5ab22ff", + "rev": "57068f532d5d42601fd74e2b531204fe1cd3a8f2", "type": "github" }, "original": { diff --git a/pkgs/update-nixfiles/update-nixfiles.sh b/pkgs/update-nixfiles/update-nixfiles.sh index bac780a..6126d15 100644 --- a/pkgs/update-nixfiles/update-nixfiles.sh +++ b/pkgs/update-nixfiles/update-nixfiles.sh @@ -23,6 +23,7 @@ merge_theirs () { test_build () { local last_error local build_jobs + local now build_jobs="$(curl --fail -s -L -H "Accept: application/json" "${JOBSET_URL}/latest-eval" | jq -r ".builds | .[]")" for build in ${build_jobs}; do @@ -42,8 +43,9 @@ test_build () { echo "Build ${build} was successful" done + now="$(date +%s)" last_error="$(curl --fail -s -L -H "Accept: application/json" "${JOBSET_URL}" | jq -r ".errortime")" - [[ $last_error -gt $(date +%s) ]] && + [[ $last_error -gt $now ]] && echo "Evaluation error encountered at $(date +%Y-%m-%d-%H:%M:%S --date="@${last_error}")" && exit 1 } @@ -55,7 +57,7 @@ wait_for_hydra () { counter=0 git_rev="$(git -C "${1}/nixfiles" rev-parse update-inputs)" while true; do - hydra_rev="$(curl -s -L -H "Accept: application/json" "${2}/latest-eval" | jq -r .flake | sed -E "s/.+&rev=(.*)/\1/g")" + hydra_rev="$(curl -s -L -H "Accept: application/json" "${2}/evals" | jq -r '.evals | max_by(.id) | .flake' | sed -E "s/.+&rev=(.*)/\1/g")" if [[ "${git_rev}" == "${hydra_rev}" ]]; then echo "Hydra got new commit" break