1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-03 10:21:47 +02:00

When ‘--help’ is given, just run ‘man’ to show the manual page

I.e. do what git does.  I'm too lazy to keep the builtin help text up
to date :-)

Also add ‘--help’ to various commands that lacked it
(e.g. nix-collect-garbage).
This commit is contained in:
Eelco Dolstra 2012-10-03 16:37:06 -04:00
parent 9c41c66c5b
commit a562d544d8
25 changed files with 51 additions and 329 deletions

View file

@ -1,15 +1,10 @@
bin_PROGRAMS = nix-instantiate
nix_instantiate_SOURCES = nix-instantiate.cc help.txt
nix_instantiate_SOURCES = nix-instantiate.cc
nix_instantiate_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \
../libstore/libstore.la ../libutil/libutil.la \
../boost/format/libformat.la
nix-instantiate.o: help.txt.hh
%.txt.hh: %.txt
../bin2c/bin2c helpText < $< > $@ || (rm $@ && exit 1)
AM_CXXFLAGS = \
-I$(srcdir)/.. -I$(srcdir)/../libutil -I$(srcdir)/../libstore \
-I$(srcdir)/../libexpr -I$(srcdir)/../libmain -I../libexpr

View file

@ -1,31 +0,0 @@
Usage: nix-instantiate [OPTIONS...] [FILES...]
`nix-instantiate' turns Nix expressions into store derivations.
The argument `-' may be specified to read a Nix expression from
standard input.
Options:
--version: output version information
--help: display help
--verbose / -v: verbose operation (may be repeated)
--eval-only: evaluate and print resulting term; do not instantiate
--parse-only: parse and print abstract syntax tree
--attr / -A PATH: select an attribute from the top-level expression
--add-root: add garbage collector roots for the result
For --eval-only / --parse-only:
--xml: print an XML representation of the abstract syntax tree
--no-location: don't provide source location information in the
output XML tree
For --eval-only:
--strict: compute attributes and list elements, rather than being
lazy

View file

@ -8,7 +8,6 @@
#include "util.hh"
#include "store-api.hh"
#include "common-opts.hh"
#include "help.txt.hh"
#include <map>
#include <iostream>
@ -19,7 +18,7 @@ using namespace nix;
void printHelp()
{
std::cout << string((char *) helpText);
showManPage("nix-instantiate");
}