* Rename.

svn path=/nixpkgs/trunk/; revision=6829
This commit is contained in:
Eelco Dolstra 2006-10-24 20:57:51 +00:00
parent 18d730980c
commit 821b647832
6 changed files with 6 additions and 6 deletions

View File

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