From 659c829e883b782137ca743df6f3b0b5d0b750b5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 19 Jul 2013 14:36:52 +0200
Subject: [PATCH] Tweaks for nix-shell

---
 dev-shell             | 7 +++++++
 doc/manual/manual.xml | 4 ++--
 release.nix           | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100755 dev-shell

diff --git a/dev-shell b/dev-shell
new file mode 100755
index 00000000..d996c245
--- /dev/null
+++ b/dev-shell
@@ -0,0 +1,7 @@
+#! /bin/sh
+s=$(type -p nix-shell)
+exec $s release.nix -A build.x86_64-linux --exclude tarball --command "
+    export NIX_REMOTE=daemon
+    export NIX_PATH='$NIX_PATH'
+    export NIX_BUILD_SHELL=$(type -p bash)
+    exec $s release.nix -A tarball" "$@"
diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
index 2d2b6500..c9273cde 100644
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -52,8 +52,7 @@
 
 
     <copyright>
-      <year>2009</year>
-      <year>2010</year>
+      <year>2009-2013</year>
       <holder>Eelco Dolstra</holder>
     </copyright>
 
@@ -64,6 +63,7 @@
   <xi:include href="introduction.xml" />
   <xi:include href="installation.xml" />
   <xi:include href="projects.xml" />
+  <xi:include href="hacking.xml" />
 
 
 </book>
diff --git a/release.nix b/release.nix
index 94cf22e4..aaab87d6 100644
--- a/release.nix
+++ b/release.nix
@@ -24,7 +24,7 @@ in rec {
 
       versionSuffix = if officialRelease then "" else "pre${toString hydraSrc.revCount}-${hydraSrc.gitTag}";
 
-      preConfigure = ''
+      preHook = ''
         # TeX needs a writable font cache.
         export VARTEXFONTS=$TMPDIR/texfonts
       '';
@@ -118,7 +118,7 @@ in rec {
           gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial gnused graphviz bazaar
         ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] );
 
-      preConfigure = "patchShebangs .";
+      preCheck = "patchShebangs .";
 
       postInstall = ''
         mkdir -p $out/nix-support