From 60da5d2b8f0f8586520566155172c1a18e4f04cc Mon Sep 17 00:00:00 2001
From: Robert Vollmert <rob@vllmrt.net>
Date: Thu, 6 Jul 2017 16:37:19 +0200
Subject: [PATCH 1/2] Fix nix-instantiate manpage indentation

The second command variant is now its own cmdsynopsis, which ensures
it's not indented as was the case using sbrk.
---
 doc/manual/command-ref/nix-instantiate.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/manual/command-ref/nix-instantiate.xml b/doc/manual/command-ref/nix-instantiate.xml
index 3d03358be..fe077ff65 100644
--- a/doc/manual/command-ref/nix-instantiate.xml
+++ b/doc/manual/command-ref/nix-instantiate.xml
@@ -43,7 +43,8 @@
       <arg choice='plain'><option>-E</option></arg>
     </group>
     <arg choice='plain' rep='repeat'><replaceable>files</replaceable></arg>
-    <sbr/>
+  </cmdsynopsis>
+  <cmdsynopsis>
     <command>nix-instantiate</command>
     <arg choice='plain'><option>--find-file</option></arg>
     <arg choice='plain' rep='repeat'><replaceable>files</replaceable></arg>

From 01722b3d2c10090f53290e68b585c50d042f0adb Mon Sep 17 00:00:00 2001
From: Robert Vollmert <rob@vllmrt.net>
Date: Thu, 6 Jul 2017 17:56:15 +0200
Subject: [PATCH 2/2] Remove unused variable from test script

---
 tests/common.sh.in | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/common.sh.in b/tests/common.sh.in
index 6c3804a25..a8d56707e 100644
--- a/tests/common.sh.in
+++ b/tests/common.sh.in
@@ -1,7 +1,5 @@
 set -e
 
-datadir="@datadir@"
-
 export TEST_ROOT=$(realpath ${TMPDIR:-/tmp}/nix-test)
 export NIX_STORE_DIR
 if ! NIX_STORE_DIR=$(readlink -f $TEST_ROOT/store 2> /dev/null); then