diff --git a/doc/manual/rl-next/json-format-changes.md b/doc/manual/rl-next/json-format-changes.md index e264daf04..78e543512 100644 --- a/doc/manual/rl-next/json-format-changes.md +++ b/doc/manual/rl-next/json-format-changes.md @@ -49,17 +49,10 @@ The new structured format follows the [JSON guidelines](@docroot@/development/js Content address is now a structured JSON object instead of a string: - Old: `"ca": "fixed:r:sha256:1abc..."` - - New: `"ca": {"method": "nar", "hash": {"algorithm": "sha256", "format": "base16", "hash": "10c209fa..."}}` + - New: `"ca": {"method": "nar", "hash": "sha256-ungWv48Bz+pBQUDeXa4iI7ADYaOWF3qctBD/YfIAFa0="}` - Still `null` values for input-addressed store objects -- **Structured hash fields**: - - Hash values (`narHash` and `downloadHash`) are now structured JSON objects instead of strings: - - - Old: `"narHash": "sha256:FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="` - - New: `"narHash": {"algorithm": "sha256", "format": "base16", "hash": "15e3c5608946..."}` - - Same structure applies to `downloadHash` in NAR info contexts - - The `format` field is always `"base16"` (hexadecimal) + The `hash` field uses the [SRI](https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity) format like other hashes. Nix currently only produces, and doesn't consume this format. diff --git a/doc/manual/source/protocols/json/hash.md b/doc/manual/source/protocols/json/hash.md index f2af5303f..3ecff4da0 100644 --- a/doc/manual/source/protocols/json/hash.md +++ b/doc/manual/source/protocols/json/hash.md @@ -5,13 +5,13 @@ ### SHA-256 ```json -{{#include schema/hash-v1/sha256-base16.json}} +{{#include schema/hash-v1/sha256.json}} ``` ### BLAKE3 ```json -{{#include schema/hash-v1/blake3-base16.json}} +{{#include schema/hash-v1/blake3.json}} ```