max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-22 14:06:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9964 from fricklerhandwerk/merge-format-sections

Browse source 
move JSON section into Formats and Protocols
This commit is contained in:
Eelco Dolstra 2024-02-08 16:53:59 +01:00 committed by GitHub
commit 6563a58294
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/manual/src/SUMMARY.md.in
View file

@ -104,10 +104,10 @@
- [Channels](command-ref/files/channels.md) - [Channels](command-ref/files/channels.md)
- [Default Nix expression](command-ref/files/default-nix-expression.md) - [Default Nix expression](command-ref/files/default-nix-expression.md)
- [Architecture and Design](architecture/architecture.md) - [Architecture and Design](architecture/architecture.md)
- [JSON Formats](json/index.md) - [Formats and Protocols](protocols/index.md)
- [Store Object Info](json/store-object-info.md) - [JSON Formats](protocols/json/index.md)
- [Derivation](json/derivation.md) - [Store Object Info](protocols/json/store-object-info.md)
- [Protocols](protocols/index.md) - [Derivation](protocols/json/derivation.md)
- [Serving Tarball Flakes](protocols/tarball-fetcher.md) - [Serving Tarball Flakes](protocols/tarball-fetcher.md)
- [Derivation "ATerm" file format](protocols/derivation-aterm.md) - [Derivation "ATerm" file format](protocols/derivation-aterm.md)
- [Glossary](glossary.md) - [Glossary](glossary.md)

1
doc/manual/src/_redirects
View file

@ -36,5 +36,6 @@
/package-management/s3-substituter /store/types/s3-binary-cache-store 301! /package-management/s3-substituter /store/types/s3-binary-cache-store 301!
/protocols/protocols /protocols 301! /protocols/protocols /protocols 301!
/json/* /protocols/json/:splat 301!
/release-notes/release-notes /release-notes 301! /release-notes/release-notes /release-notes 301!

0
doc/manual/src/json/derivation.md → doc/manual/src/protocols/json/derivation.md
View file

5
doc/manual/src/json/store-object-info.md → doc/manual/src/protocols/json/store-object-info.md
View file

@ -14,11 +14,11 @@ Info about a [store object].
* `narHash`: * `narHash`:
Hash of the [file system object] part of the store object when serialized as a [Nix Archive](#gloss-nar). Hash of the [file system object] part of the store object when serialized as a [Nix Archive].
* `narSize`: * `narSize`:
Size of the [file system object] part of the store object when serialized as a [Nix Archive](#gloss-nar). Size of the [file system object] part of the store object when serialized as a [Nix Archive].
* `references`: * `references`:
@ -30,6 +30,7 @@ Info about a [store object].
[store path]: @docroot@/glossary.md#gloss-store-path [store path]: @docroot@/glossary.md#gloss-store-path
[file system object]: @docroot@/store/file-system-object.md [file system object]: @docroot@/store/file-system-object.md
[Nix Archive]: @docroot@/glossary.md#gloss-nar
## Impure fields ## Impure fields

2
src/nix/derivation-add.md
View file

@ -14,6 +14,6 @@ a Nix expression evaluates.
`nix derivation add` takes a single derivation in the following format: `nix derivation add` takes a single derivation in the following format:
{{#include ../../json/derivation.md}} {{#include ../../protocols/json/derivation.md}}
)"" )""

2
src/nix/derivation-show.md
View file

@ -52,6 +52,6 @@ By default, this command only shows top-level derivations, but with
[store path]: @docroot@/glossary.md#gloss-store-path [store path]: @docroot@/glossary.md#gloss-store-path
{{#include ../../json/derivation.md}} {{#include ../../protocols/json/derivation.md}}
)"" )""