diff --git a/doc/manual/rl-next/json-format-changes.md b/doc/manual/rl-next/json-format-changes.md index bd7e112435a..009c1639c9b 100644 --- a/doc/manual/rl-next/json-format-changes.md +++ b/doc/manual/rl-next/json-format-changes.md @@ -19,7 +19,7 @@ The store path info JSON format has been updated from version 1 to version 2: 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": "base64", "hash": "EMIJ+giQ..."}}` + - New: `"ca": {"method": "nar", "hash": {"algorithm": "sha256", "format": "base16", "hash": "10c209fa..."}}` - Still `null` values for input-addressed store objects - **Structured hash fields**: @@ -27,8 +27,9 @@ The store path info JSON format has been updated from version 1 to version 2: Hash values (`narHash` and `downloadHash`) are now structured JSON objects instead of strings: - Old: `"narHash": "sha256:FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="` - - New: `"narHash": {"algorithm": "sha256", "format": "base64", "hash": "FePFYIlM..."}` + - New: `"narHash": {"algorithm": "sha256", "format": "base16", "hash": "15e3c5608946..."}` - Same structure applies to `downloadHash` in NAR info contexts + - The `format` field is always `"base16"` (hexadecimal) Nix currently only produces, and doesn't consume this format. @@ -48,8 +49,8 @@ The derivation JSON format has been updated from version 3 to version 4: - **Consistent content addresses**: Floating content-addressed outputs now use structured JSON format. - This is the same format as `ca` in in store path info (after the new version). + This is the same format as `ca` in store path info (after the new version). Version 3 and earlier formats are *not* accepted when reading. -**Affected command**: `nix derivation`, namely it's `show` and `add` sub-commands. +**Affected command**: `nix derivation`, namely its `show` and `add` sub-commands. diff --git a/doc/manual/source/protocols/json/hash.md b/doc/manual/source/protocols/json/hash.md index 988c8466ba3..f2af5303f66 100644 --- a/doc/manual/source/protocols/json/hash.md +++ b/doc/manual/source/protocols/json/hash.md @@ -2,28 +2,16 @@ ## Examples -### SHA-256 with Base64 encoding - -```json -{{#include schema/hash-v1/sha256-base64.json}} -``` - -### SHA-256 with Base16 (hexadecimal) encoding +### SHA-256 ```json {{#include schema/hash-v1/sha256-base16.json}} ``` -### SHA-256 with Nix32 encoding - -```json -{{#include schema/hash-v1/sha256-nix32.json}} -``` - -### BLAKE3 with Base64 encoding +### BLAKE3 ```json -{{#include schema/hash-v1/blake3-base64.json}} +{{#include schema/hash-v1/blake3-base16.json}} ```