Updating from trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=18341

2 files changed, 28 insertions, 1 deletions

diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 6966b5c0bf9b..8fd86cd24815 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -1,6 +1,28 @@
 {stdenv, git}:
 {url, rev ? "HEAD", md5 ? "", sha256 ? ""}:
 
+/* NOTE:
+   fetchgit has one problem: git fetch only works for refs.
+   This is because fetching arbitrary (maybe dangling) commits may be a security risk
+   and checking whether a commit belongs to a ref is expensive. This may
+   change in the future when some caching is added to git (?)
+   Usually refs are either tags (refs/tags/*) or branches (refs/heads/*)
+   Cloning branches will make the hash check fail when there is an update.
+   But not all patches we want can be accessed by tags.
+
+   The workaround is getting the last n commits so that it's likly that they
+   still contain the hash we want.
+
+   for now : increase depth iteratively (TODO)
+
+   real fix: ask git folks to add a
+   git fetch $HASH contained in $BRANCH
+   facility because checking that $HASH is contained in $BRANCH is less
+   expensive than fetching --depth $N.
+   Even if git folks implemented this feature soon it may take years until
+   server admins start using the new version?
+*/
+
 stdenv.mkDerivation {
   name = "git-export";
   builder = ./builder.sh;
diff --git a/pkgs/build-support/fetchmtn/builder.sh b/pkgs/build-support/fetchmtn/builder.sh
index f39e38168802..4e34aad052b5 100644
--- a/pkgs/build-support/fetchmtn/builder.sh
+++ b/pkgs/build-support/fetchmtn/builder.sh
@@ -11,7 +11,7 @@ header "getting revision $selector";
 
 done=;
 for source in $dbs; do
-	if mtn pull --debug --db "$cacheDB" "$source" "${branch}"; then
+	if mtn pull --db "$cacheDB" "$source" "${branch}"; then
 		revision="$(mtn --db "$cacheDB" au toposort $(mtn --db "$cacheDB" au select "$selector") | tail -1)";
 		if [ -n "$revision" ]; then
 			if mtn --db "$cacheDB" au get_revision "$revision"; then
@@ -44,3 +44,8 @@ fi;
 
 stopNest
 
+header "clearing _MTN in the output"
+
+rm -rf "$out/_MTN"
+
+stopNest