lix-project/lix
20
57
Fork 31
Code Issues 347 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Rename 'nix store make-content-addressable' to 'nix store make-content-addressed'

Browse source
This commit is contained in:
Eelco Dolstra 2022-03-22 21:54:49 +01:00
parent f18607549c
commit 5acaf13d35
4 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/manual/src/release-notes/rl-next.md
View file

@ -1,3 +1,6 @@
# Release X.Y (202?-??-??) # Release X.Y (202?-??-??)
* Various nix commands can now read expressions from stdin with `--file -`. * Various nix commands can now read expressions from stdin with `--file -`.
* `nix store make-content-addressable` has been renamed to `nix store
make-content-addressed`.

2
src/nix/main.cc
View file

@ -117,7 +117,7 @@ struct NixArgs : virtual MultiCommand, virtual MixCommonArgs
{"hash-path", {"hash", "path"}}, {"hash-path", {"hash", "path"}},
{"ls-nar", {"nar", "ls"}}, {"ls-nar", {"nar", "ls"}},
{"ls-store", {"store", "ls"}}, {"ls-store", {"store", "ls"}},
{"make-content-addressable", {"store", "make-content-addressable"}}, {"make-content-addressable", {"store", "make-content-addressed"}},
{"optimise-store", {"store", "optimise"}}, {"optimise-store", {"store", "optimise"}},
{"ping-store", {"store", "ping"}}, {"ping-store", {"store", "ping"}},
{"sign-paths", {"store", "sign"}}, {"sign-paths", {"store", "sign"}},

8
src/nix/make-content-addressable.cc → src/nix/make-content-addressed.cc
View file

@ -6,9 +6,9 @@
using namespace nix; using namespace nix;
struct CmdMakeContentAddressable : StorePathsCommand, MixJSON struct CmdMakeContentAddressed : StorePathsCommand, MixJSON
{ {
CmdMakeContentAddressable() CmdMakeContentAddressed()
{ {
realiseMode = Realise::Outputs; realiseMode = Realise::Outputs;
} }
@ -21,7 +21,7 @@ struct CmdMakeContentAddressable : StorePathsCommand, MixJSON
std::string doc() override std::string doc() override
{ {
return return
#include "make-content-addressable.md" #include "make-content-addressed.md"
; ;
} }
@ -50,4 +50,4 @@ struct CmdMakeContentAddressable : StorePathsCommand, MixJSON
} }
}; };
static auto rCmdMakeContentAddressable = registerCommand2<CmdMakeContentAddressable>({"store", "make-content-addressable"}); static auto rCmdMakeContentAddressed = registerCommand2<CmdMakeContentAddressed>({"store", "make-content-addressed"});

4
src/nix/make-content-addressable.md → src/nix/make-content-addressed.md
View file

@ -5,7 +5,7 @@ R""(
* Create a content-addressed representation of the closure of GNU Hello: * Create a content-addressed representation of the closure of GNU Hello:
```console ```console
# nix store make-content-addressable -r nixpkgs#hello # nix store make-content-addressed nixpkgs#hello
… …
rewrote '/nix/store/v5sv61sszx301i0x6xysaqzla09nksnd-hello-2.10' to '/nix/store/5skmmcb9svys5lj3kbsrjg7vf2irid63-hello-2.10' rewrote '/nix/store/v5sv61sszx301i0x6xysaqzla09nksnd-hello-2.10' to '/nix/store/5skmmcb9svys5lj3kbsrjg7vf2irid63-hello-2.10'
``` ```
@ -29,7 +29,7 @@ R""(
system closure: system closure:
```console ```console
# nix store make-content-addressable -r /run/current-system # nix store make-content-addressed /run/current-system
``` ```
# Description # Description