From 821b64783213085310b450b009f81ddf74c32bff Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 24 Oct 2006 20:57:51 +0000
Subject: [PATCH] * Rename.

svn path=/nixpkgs/trunk/; revision=6829
---
 pkgs/stdenv/linux/default.nix                        | 12 ++++++------
 .../builder-stdenv-initial.sh                        |  0
 .../linux/{new-scripts => scripts}/download.sh       |  0
 .../stdenv/linux/{new-scripts => scripts}/prehook.sh |  0
 .../linux/{new-scripts => scripts}/unpack-curl.sh    |  0
 pkgs/stdenv/linux/{new-scripts => scripts}/unpack.sh |  0
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename pkgs/stdenv/linux/{new-scripts => scripts}/builder-stdenv-initial.sh (100%)
 rename pkgs/stdenv/linux/{new-scripts => scripts}/download.sh (100%)
 rename pkgs/stdenv/linux/{new-scripts => scripts}/prehook.sh (100%)
 rename pkgs/stdenv/linux/{new-scripts => scripts}/unpack-curl.sh (100%)
 rename pkgs/stdenv/linux/{new-scripts => scripts}/unpack.sh (100%)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index f07fa0b0e12f..32d0fc207b54 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -27,7 +27,7 @@ rec {
     name = "curl";
     builder = bootstrapTools.bash;
     inherit (bootstrapTools) bunzip2 cp curl;
-    args = [ ./new-scripts/unpack-curl.sh ];
+    args = [ ./scripts/unpack-curl.sh ];
   };
 
   # This function downloads a file.
@@ -35,7 +35,7 @@ rec {
     name = baseNameOf (toString url);
     builder = bootstrapTools.bash;
     inherit system curl url;
-    args = [ ./new-scripts/download.sh ];
+    args = [ ./scripts/download.sh ];
     outputHashAlgo = "sha1";
     outputHash = sha1;
   };
@@ -45,7 +45,7 @@ rec {
     name = pkgname;
     builder = bootstrapTools.bash;
     inherit (bootstrapTools) bunzip2 tar cp;
-    args = [ ./new-scripts/unpack.sh ];
+    args = [ ./scripts/unpack.sh ];
     tarball = download {inherit url sha1 pkgname;};
     inherit system;
     allowedReferences = [];
@@ -78,7 +78,7 @@ rec {
     body = derivation {
       name = "stdenv-linux-initial";
       builder = bootstrapTools.bash;
-      args = [ ./new-scripts/builder-stdenv-initial.sh ];
+      args = [ ./scripts/builder-stdenv-initial.sh ];
       inherit system staticTools curl;
     } // {
       # !!! too much duplication with stdenv/generic/default.nix
@@ -101,7 +101,7 @@ rec {
     import ../generic {
       name = "stdenv-linux-boot";
       param1 = if staticGlibc then "static" else "dynamic";
-      preHook = ./new-scripts/prehook.sh;
+      preHook = ./scripts/prehook.sh;
       stdenv = stdenvInitial;
       shell = bootstrapTools.bash;
       initialPath = [
@@ -178,7 +178,7 @@ rec {
   #    of all other tools.
   stdenvLinux = (import ../generic) {
     name = "stdenv-linux";
-    preHook = ./new-scripts/prehook.sh;
+    preHook = ./scripts/prehook.sh;
     initialPath = [
       ((import ../common-path.nix) {pkgs = stdenvLinuxBoot3Pkgs;})
       stdenvLinuxBoot3Pkgs.patchelf
diff --git a/pkgs/stdenv/linux/new-scripts/builder-stdenv-initial.sh b/pkgs/stdenv/linux/scripts/builder-stdenv-initial.sh
similarity index 100%
rename from pkgs/stdenv/linux/new-scripts/builder-stdenv-initial.sh
rename to pkgs/stdenv/linux/scripts/builder-stdenv-initial.sh
diff --git a/pkgs/stdenv/linux/new-scripts/download.sh b/pkgs/stdenv/linux/scripts/download.sh
similarity index 100%
rename from pkgs/stdenv/linux/new-scripts/download.sh
rename to pkgs/stdenv/linux/scripts/download.sh
diff --git a/pkgs/stdenv/linux/new-scripts/prehook.sh b/pkgs/stdenv/linux/scripts/prehook.sh
similarity index 100%
rename from pkgs/stdenv/linux/new-scripts/prehook.sh
rename to pkgs/stdenv/linux/scripts/prehook.sh
diff --git a/pkgs/stdenv/linux/new-scripts/unpack-curl.sh b/pkgs/stdenv/linux/scripts/unpack-curl.sh
similarity index 100%
rename from pkgs/stdenv/linux/new-scripts/unpack-curl.sh
rename to pkgs/stdenv/linux/scripts/unpack-curl.sh
diff --git a/pkgs/stdenv/linux/new-scripts/unpack.sh b/pkgs/stdenv/linux/scripts/unpack.sh
similarity index 100%
rename from pkgs/stdenv/linux/new-scripts/unpack.sh
rename to pkgs/stdenv/linux/scripts/unpack.sh