mirror of
https://github.com/NixOS/nix
synced 2025-06-25 06:31:14 +02:00
"but doctor, I AM the untrusted store": nix doctor had wrong trustedness
This probably snuck in in a refactor using truthiness or so. The trustedness flag was having the optional fullness checked, rather than the actual contained trust level. Also adds some tests. ``` m1@6876551b-255d-4cb0-af02-8a4f17b27e2e ~ % nix store ping warning: 'nix store ping' is a deprecated alias for 'nix store info' Store URL: daemon Version: 2.20.4 Trusted: 0 m1@6876551b-255d-4cb0-af02-8a4f17b27e2e ~ % nix doctor warning: 'doctor' is a deprecated alias for 'config check' [PASS] PATH contains only one nix version. [PASS] All profiles are gcroots. [PASS] Client protocol matches store protocol. [INFO] You are trusted by store uri: daemon ```
This commit is contained in:
parent
fef952e258
commit
dea23c3c9b
3 changed files with 11 additions and 5 deletions
|
@ -13,6 +13,8 @@ startDaemon
|
|||
if isDaemonNewer "2.15pre0"; then
|
||||
# Ensure that ping works trusted with new daemon
|
||||
nix store info --json | jq -e '.trusted'
|
||||
# Suppress grumpiness about multiple nixes on PATH
|
||||
(nix doctor || true) 2>&1 | grep 'You are trusted by'
|
||||
else
|
||||
# And the the field is absent with the old daemon
|
||||
nix store info --json | jq -e 'has("trusted") | not'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue