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 @@ - 2009 - 2010 + 2009-2013 Eelco Dolstra @@ -64,6 +63,7 @@ + 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