From e6e6f033ecda4cf82c9bdfea16eb5aef234cb4d1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Jan 2011 11:04:09 +0000
Subject: [PATCH] pkgs/applications/version-management/git-and-tools/git:
 cosmetic changes to improve consistency

No functional change is intended.

svn path=/nixpkgs/trunk/; revision=25456
---
 .../version-management/git-and-tools/git/default.nix      | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index cc54af5cf761..eafa0deccfc8 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -95,9 +95,8 @@ stdenv.mkDerivation rec {
 		"$out/libexec/git-core/$prog"
        done
      '' else ''
-      # Don't wrap Tcl/Tk, replace them by notification scripts
-       for prog in bin/gitk libexec/git-core/git-gui
-       do
+       # Don't wrap Tcl/Tk, replace them by notification scripts
+       for prog in bin/gitk libexec/git-core/git-gui; do
          notSupported "$out/$prog" \
                       "reinstall with config git = { guiSupport = true; } set"
        done
@@ -111,7 +110,7 @@ stdenv.mkDerivation rec {
    # multiple times into $out so replace duplicates by symlinks because I
    # haven't tested whether the nix distribution system can handle hardlinks.
    # This reduces the size of $out from 115MB down to 13MB on x86_64-linux!
-   + ''#
+   + ''
       declare -A seen
       shopt -s globstar
       for f in "$out/"**; do
@@ -124,7 +123,6 @@ stdenv.mkDerivation rec {
           rm "$f"; ln -v -s "''\${seen["$sum"]}" "$f"
         fi
       done
-
      '';
 
   enableParallelBuilding = true;