* Indent consistently.

svn path=/nixpkgs/branches/usability/; revision=4995
This commit is contained in:
Eelco Dolstra 2006-03-08 15:00:18 +00:00
parent 07bc3fbf00
commit 2c98c02901

View File

@ -136,15 +136,18 @@ rec {
patch = useFromStdenv (stdenv ? patch) stdenv.patch patch = useFromStdenv (stdenv ? patch) stdenv.patch
(if stdenv.system == "powerpc-darwin" then null else gnupatch); (if stdenv.system == "powerpc-darwin" then null else gnupatch);
gnused = useFromStdenv (stdenv ? gnused) stdenv.gnused (import ../tools/text/gnused { gnused = useFromStdenv (stdenv ? gnused) stdenv.gnused
(import ../tools/text/gnused {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}); });
gnugrep = useFromStdenv (stdenv ? gnugrep) stdenv.gnugrep (import ../tools/text/gnugrep { gnugrep = useFromStdenv (stdenv ? gnugrep) stdenv.gnugrep
(import ../tools/text/gnugrep {
inherit fetchurl stdenv pcre; inherit fetchurl stdenv pcre;
}); });
gawk = useFromStdenv (stdenv ? gawk) stdenv.gawk (import ../tools/text/gawk { gawk = useFromStdenv (stdenv ? gawk) stdenv.gawk
(import ../tools/text/gawk {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}); });
@ -186,7 +189,8 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
gnutar = useFromStdenv (stdenv ? gnutar) stdenv.gnutar (import ../tools/archivers/gnutar { gnutar = useFromStdenv (stdenv ? gnutar) stdenv.gnutar
(import ../tools/archivers/gnutar {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}); });
@ -202,11 +206,13 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
gzip = useFromStdenv (stdenv ? gzip) stdenv.gzip (import ../tools/compression/gzip { gzip = useFromStdenv (stdenv ? gzip) stdenv.gzip
(import ../tools/compression/gzip {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}); });
bzip2 = useFromStdenv (stdenv ? bzip2) stdenv.bzip2 (import ../tools/compression/bzip2 { bzip2 = useFromStdenv (stdenv ? bzip2) stdenv.bzip2
(import ../tools/compression/bzip2 {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}); });
@ -338,7 +344,8 @@ rec {
### SHELLS ### SHELLS
bash = useFromStdenv (stdenv ? bash) stdenv.bash (import ../shells/bash { bash = useFromStdenv (stdenv ? bash) stdenv.bash
(import ../shells/bash {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}); });
@ -374,9 +381,9 @@ rec {
}; };
patchelf = useFromStdenv (stdenv ? patchelf) stdenv.patchelf patchelf = useFromStdenv (stdenv ? patchelf) stdenv.patchelf
(import ../development/tools/misc/patchelf) { (import ../development/tools/misc/patchelf {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; });
gnum4 = (import ../development/tools/misc/gnum4) { gnum4 = (import ../development/tools/misc/gnum4) {
inherit fetchurl stdenv; inherit fetchurl stdenv;