diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46c201c1a995..883f323f5277 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1940,7 +1940,7 @@ let pkgs = rec {
 
   rLang = import ../development/interpreters/r-lang {
     inherit fetchurl stdenv readline perl g77_42 libpng zlib;
-		inherit (xorg) libX11 libXt;
+    inherit (xorg) libX11 libXt;
   };
 
   rubygemsFun = builderDefsPackage (import ../development/interpreters/ruby/gems.nix) {
@@ -2090,7 +2090,7 @@ let pkgs = rec {
 
   ddd = import ../development/tools/misc/ddd {
     inherit fetchurl stdenv lesstif ncurses;
-		inherit (xlibs) libX11 libXt;
+    inherit (xlibs) libX11 libXt;
   };
 
   elfutilsFun = lib.sumArgs
@@ -7044,7 +7044,7 @@ let pkgs = rec {
 
   emboss = import ../applications/science/biology/emboss {
     inherit fetchurl stdenv readline perl libpng zlib;
-		inherit (xorg) libX11 libXt;
+    inherit (xorg) libX11 libXt;
   };
 
   mrbayes = import ../applications/science/biology/mrbayes {
diff --git a/pkgs/top-level/builder-defs.nix b/pkgs/top-level/builder-defs.nix
index c2ec8f5ce4ab..d1f6321e72af 100644
--- a/pkgs/top-level/builder-defs.nix
+++ b/pkgs/top-level/builder-defs.nix
@@ -453,8 +453,8 @@ args: with args; with stringsWithDeps; with lib;
         ";
 
         doMakeCheck = FullDepEntry (''
-	  make check
-	'') ["minInit"];
+          make check
+        '') ["minInit"];
 
         extraDerivationAttrs = lib.getAttr ["extraDerivationAttrs"] {} args;
 
diff --git a/pkgs/top-level/template-composing+config.nix b/pkgs/top-level/template-composing+config.nix
index 7f7e55302dda..a774d421efab 100644
--- a/pkgs/top-level/template-composing+config.nix
+++ b/pkgs/top-level/template-composing+config.nix
@@ -1,22 +1,22 @@
 args : with args; let localDefs = builderDefs (args // rec {
-		src = /* put a fetchurl here */
-		(abort "Specify source");
-		useConfig = true;
-		reqsList = [
-			["true" ]
-			["false"]
-		];
-		/* List consisiting of an even number of strings; "key" "value" */
-		configFlags = [
-		];
-	}) args null; /* null is a terminator for sumArgs */
-	in with localDefs;
+                src = /* put a fetchurl here */
+                (abort "Specify source");
+                useConfig = true;
+                reqsList = [
+                        ["true" ]
+                        ["false"]
+                ];
+                /* List consisiting of an even number of strings; "key" "value" */
+                configFlags = [
+                ];
+        }) args null; /* null is a terminator for sumArgs */
+        in with localDefs;
 stdenv.mkDerivation rec {
-	name = "${(abort "Specify name")}"+version;
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs [(abort "Check phases") doMakeInstall doForceShare doPropagate]);
-	meta = {
-		description = "${(abort "Specify description")}";
-		inherit src;
-	};
+        name = "${(abort "Specify name")}"+version;
+        builder = writeScript (name + "-builder")
+                (textClosure localDefs [(abort "Check phases") doMakeInstall doForceShare doPropagate]);
+        meta = {
+                description = "${(abort "Specify description")}";
+                inherit src;
+        };
 }