From 2cbc76177988f125c818c10e0a3fd8c018621dc8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 20 Apr 2009 12:37:10 +0000
Subject: [PATCH] * Move builder-defs to pkgs/build-support.  (pkgs/top-level
 is for   composition.)

svn path=/nixpkgs/trunk/; revision=15175
---
 .../builder-defs}/builder-defs.nix              |  0
 .../builder-defs}/template-composing+config.nix |  0
 .../template-composing-builder.nix              |  0
 pkgs/top-level/all-packages.nix                 |  2 +-
 pkgs/top-level/template-debian.nix              | 14 --------------
 pkgs/top-level/template-simple.nix              | 17 -----------------
 6 files changed, 1 insertion(+), 32 deletions(-)
 rename pkgs/{top-level => build-support/builder-defs}/builder-defs.nix (100%)
 rename pkgs/{top-level => build-support/builder-defs}/template-composing+config.nix (100%)
 rename pkgs/{top-level => build-support/builder-defs}/template-composing-builder.nix (100%)
 delete mode 100644 pkgs/top-level/template-debian.nix
 delete mode 100644 pkgs/top-level/template-simple.nix

diff --git a/pkgs/top-level/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix
similarity index 100%
rename from pkgs/top-level/builder-defs.nix
rename to pkgs/build-support/builder-defs/builder-defs.nix
diff --git a/pkgs/top-level/template-composing+config.nix b/pkgs/build-support/builder-defs/template-composing+config.nix
similarity index 100%
rename from pkgs/top-level/template-composing+config.nix
rename to pkgs/build-support/builder-defs/template-composing+config.nix
diff --git a/pkgs/top-level/template-composing-builder.nix b/pkgs/build-support/builder-defs/template-composing-builder.nix
similarity index 100%
rename from pkgs/top-level/template-composing-builder.nix
rename to pkgs/build-support/builder-defs/template-composing-builder.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9daf84ed079..9afdcfc1b82 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -159,7 +159,7 @@ let
       abort ("Unknown option specified: " + result))
     else x);
 
-  builderDefs = composedArgsAndFun (import ./builder-defs.nix) {
+  builderDefs = composedArgsAndFun (import ../build-support/builder-defs/builder-defs.nix) {
     inherit stringsWithDeps lib stdenv writeScript fetchurl;
   };
 
diff --git a/pkgs/top-level/template-debian.nix b/pkgs/top-level/template-debian.nix
deleted file mode 100644
index 80621b27c4d..00000000000
--- a/pkgs/top-level/template-debian.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-args: with args; with debPackage;
-debBuild ({
-  src = fetchurl {
-    url = mirror://debian/pool/(abort "Specify URL");
-  };
-  patch = fetchurl {
-    url = mirror://debian/pool/(abort "Specify URL");
-  };
-  name = "${abort "Specify name"}";
-  buildInputs = [];
-  meta = {
-    description = "${abort "Specify description"}";
-  };
-} // args)
diff --git a/pkgs/top-level/template-simple.nix b/pkgs/top-level/template-simple.nix
deleted file mode 100644
index 4eac1fcad0a..00000000000
--- a/pkgs/top-level/template-simple.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "";
-
-  src = fetchurl {
-    url = ;
-    sha256 = "";
-  };
-
-  buildInputs =[];
-
-  meta = {
-    description = "
-
-";
-  };
-}