* Move builder-defs to pkgs/build-support. (pkgs/top-level is for

  composition.)

svn path=/nixpkgs/trunk/; revision=15175

6 files changed, 1 insertions, 32 deletions

diff --git a/pkgs/top-level/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix
index 8556c9529a48..8556c9529a48 100644
--- a/pkgs/top-level/builder-defs.nix
+++ b/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
index a774d421efab..a774d421efab 100644
--- a/pkgs/top-level/template-composing+config.nix
+++ b/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
index 0efb347d821c..0efb347d821c 100644
--- a/pkgs/top-level/template-composing-builder.nix
+++ b/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 9daf84ed079c..9afdcfc1b82e 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 80621b27c4d2..000000000000
--- 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 4eac1fcad0a3..000000000000
--- 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 = "
-
-";
-  };
-}