emily/nixfiles
emily/nixfiles
1
0
Fork 1
Code Issues Pull requests Activity

Update from update-inputs-2024-11-11-04-20

Browse source
This commit is contained in:
Update Bot 2024-11-11 04:20:15 +01:00
commit 87e8868126
No known key found for this signature in database
3 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/hosts/florp/configuration.nix
View file

@ -31,7 +31,7 @@
backupPrepareCommand = '' backupPrepareCommand = ''
umask 0077 umask 0077
rm -f -- ${pgBackup} 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} ${config.services.postgresql.superUser} >${pgBackup}
''; '';

20
flake.lock
View file

@ -156,11 +156,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731060864, "lastModified": 1731274291,
"narHash": "sha256-aYE7oAYZ+gPU1mPNhM0JwLAQNgjf0/JK1BF1ln2KBgk=", "narHash": "sha256-cZ0QMpv5p2a6WEE+o9uu0a4ma6RzQDOQTbm7PbixWz8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "5e40e02978e3bd63c2a6a9fa6fa8ba0e310e747f", "rev": "486250f404f4a4f4f33f8f669d83ca5f6e6b7dfc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -437,11 +437,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731187545, "lastModified": 1731279732,
"narHash": "sha256-n/BOlXvOcX5yn2mbjazfCcbojzczCdmcjQNaH7Dcdd4=", "narHash": "sha256-eZllHPzbjvTNrzImqtDrs0k1LsIIeTlp8MMN9SxMvvE=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "1845276697adca236be3e7a983238d2a2d0d57b5", "rev": "2f1130b23576a403b9b1d70d6431649bfa044621",
"revCount": 7, "revCount": 8,
"type": "git", "type": "git",
"url": "https://woof.rip/florp/about.git" "url": "https://woof.rip/florp/about.git"
}, },
@ -977,11 +977,11 @@
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1731155487, "lastModified": 1731281996,
"narHash": "sha256-+D57j7BcV5O3XH9za3c3XXVLHr+F+enThAN2EeF6H/M=", "narHash": "sha256-xdNFY/wcs8i9qluVbTAVh5JLlhI/r4JJfXb0yfEj1Ks=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "31364af1990067d5529846a2ebf17a42c5ab22ff", "rev": "57068f532d5d42601fd74e2b531204fe1cd3a8f2",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
pkgs/update-nixfiles/update-nixfiles.sh
View file

@ -23,6 +23,7 @@ merge_theirs () {
test_build () { test_build () {
local last_error local last_error
local build_jobs local build_jobs
local now
build_jobs="$(curl --fail -s -L -H "Accept: application/json" "${JOBSET_URL}/latest-eval" | jq -r ".builds | .[]")" build_jobs="$(curl --fail -s -L -H "Accept: application/json" "${JOBSET_URL}/latest-eval" | jq -r ".builds | .[]")"
for build in ${build_jobs}; do for build in ${build_jobs}; do
@ -42,8 +43,9 @@ test_build () {
echo "Build ${build} was successful" echo "Build ${build} was successful"
done done
now="$(date +%s)"
last_error="$(curl --fail -s -L -H "Accept: application/json" "${JOBSET_URL}" | jq -r ".errortime")" 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}")" && echo "Evaluation error encountered at $(date +%Y-%m-%d-%H:%M:%S --date="@${last_error}")" &&
exit 1 exit 1
} }
@ -55,7 +57,7 @@ wait_for_hydra () {
counter=0 counter=0
git_rev="$(git -C "${1}/nixfiles" rev-parse update-inputs)" git_rev="$(git -C "${1}/nixfiles" rev-parse update-inputs)"
while true; do 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 if [[ "${git_rev}" == "${hydra_rev}" ]]; then
echo "Hydra got new commit" echo "Hydra got new commit"
break break