maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1444 from robx/man

Browse source 
Fix nix-instantiate manpage indentation
This commit is contained in:
Eelco Dolstra 2017-07-07 11:04:06 +02:00 • committed by GitHub
commit eef09c220d
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
doc/manual/command-ref/nix-instantiate.xml
View file

@ -43,7 +43,8 @@
<arg choice='plain'><option>-E</option></arg> <arg choice='plain'><option>-E</option></arg>
</group> </group>
<arg choice='plain' rep='repeat'><replaceable>files</replaceable></arg> <arg choice='plain' rep='repeat'><replaceable>files</replaceable></arg>
<sbr/> </cmdsynopsis>
<cmdsynopsis>
<command>nix-instantiate</command> <command>nix-instantiate</command>
<arg choice='plain'><option>--find-file</option></arg> <arg choice='plain'><option>--find-file</option></arg>
<arg choice='plain' rep='repeat'><replaceable>files</replaceable></arg> <arg choice='plain' rep='repeat'><replaceable>files</replaceable></arg>

2
tests/common.sh.in
View file

@ -1,7 +1,5 @@
set -e set -e
datadir="@datadir@"
export TEST_ROOT=$(realpath ${TMPDIR:-/tmp}/nix-test) export TEST_ROOT=$(realpath ${TMPDIR:-/tmp}/nix-test)
export NIX_STORE_DIR export NIX_STORE_DIR
if ! NIX_STORE_DIR=$(readlink -f $TEST_ROOT/store 2> /dev/null); then if ! NIX_STORE_DIR=$(readlink -f $TEST_ROOT/store 2> /dev/null); then