public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Indent consistently.

Browse Source 
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
1 changed files with 46 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
pkgs/top-level/all-packages.nix
View File

@ -78,18 +78,18 @@ rec {
}; };
coreutils = useFromStdenv (stdenv ? coreutils) stdenv.coreutils coreutils = useFromStdenv (stdenv ? coreutils) stdenv.coreutils
(import ../tools/misc/coreutils { (import ../tools/misc/coreutils {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}); });
coreutilsDiet = (import ../tools/misc/coreutils-diet) { coreutilsDiet = (import ../tools/misc/coreutils-diet) {
inherit fetchurl stdenv dietgcc perl; inherit fetchurl stdenv dietgcc perl;
}; };
findutils = useFromStdenv (stdenv ? findutils) stdenv.findutils findutils = useFromStdenv (stdenv ? findutils) stdenv.findutils
(import ../tools/misc/findutils { (import ../tools/misc/findutils {
inherit fetchurl stdenv coreutils; inherit fetchurl stdenv coreutils;
}); });
findutilsWrapper = (import ../tools/misc/findutils-wrapper) { findutilsWrapper = (import ../tools/misc/findutils-wrapper) {
inherit stdenv findutils; inherit stdenv findutils;
@ -125,9 +125,9 @@ rec {
}; };
diffutils = useFromStdenv (stdenv ? diffutils) stdenv.diffutils diffutils = useFromStdenv (stdenv ? diffutils) stdenv.diffutils
(import ../tools/text/diffutils { (import ../tools/text/diffutils {
inherit fetchurl stdenv coreutils; inherit fetchurl stdenv coreutils;
}); });
gnupatch = (import ../tools/text/gnupatch) { gnupatch = (import ../tools/text/gnupatch) {
inherit fetchurl stdenv; inherit fetchurl stdenv;
@ -136,17 +136,20 @@ 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
inherit fetchurl stdenv; (import ../tools/text/gnused {
}); inherit fetchurl stdenv;
});
gnugrep = useFromStdenv (stdenv ? gnugrep) stdenv.gnugrep (import ../tools/text/gnugrep { gnugrep = useFromStdenv (stdenv ? gnugrep) stdenv.gnugrep
inherit fetchurl stdenv pcre; (import ../tools/text/gnugrep {
}); inherit fetchurl stdenv pcre;
});
gawk = useFromStdenv (stdenv ? gawk) stdenv.gawk (import ../tools/text/gawk { gawk = useFromStdenv (stdenv ? gawk) stdenv.gawk
inherit fetchurl stdenv; (import ../tools/text/gawk {
}); inherit fetchurl stdenv;
});
groff = (import ../tools/text/groff) { groff = (import ../tools/text/groff) {
inherit fetchurl stdenv; inherit fetchurl stdenv;
@ -186,9 +189,10 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
gnutar = useFromStdenv (stdenv ? gnutar) stdenv.gnutar (import ../tools/archivers/gnutar { gnutar = useFromStdenv (stdenv ? gnutar) stdenv.gnutar
inherit fetchurl stdenv; (import ../tools/archivers/gnutar {
}); inherit fetchurl stdenv;
});
gnutarDiet = (import ../tools/archivers/gnutar-diet) { gnutarDiet = (import ../tools/archivers/gnutar-diet) {
inherit fetchurl stdenv dietgcc; inherit fetchurl stdenv dietgcc;
@ -202,13 +206,15 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
gzip = useFromStdenv (stdenv ? gzip) stdenv.gzip (import ../tools/compression/gzip { gzip = useFromStdenv (stdenv ? gzip) stdenv.gzip
inherit fetchurl stdenv; (import ../tools/compression/gzip {
}); inherit fetchurl stdenv;
});
bzip2 = useFromStdenv (stdenv ? bzip2) stdenv.bzip2 (import ../tools/compression/bzip2 { bzip2 = useFromStdenv (stdenv ? bzip2) stdenv.bzip2
inherit fetchurl stdenv; (import ../tools/compression/bzip2 {
}); inherit fetchurl stdenv;
});
zdelta = (import ../tools/compression/zdelta) { zdelta = (import ../tools/compression/zdelta) {
inherit fetchurl stdenv; inherit fetchurl stdenv;
@ -338,9 +344,10 @@ rec {
### SHELLS ### SHELLS
bash = useFromStdenv (stdenv ? bash) stdenv.bash (import ../shells/bash { bash = useFromStdenv (stdenv ? bash) stdenv.bash
inherit fetchurl stdenv; (import ../shells/bash {
}); inherit fetchurl stdenv;
});
tcsh = (import ../shells/tcsh) { tcsh = (import ../shells/tcsh) {
inherit fetchurl stdenv ncurses; inherit fetchurl stdenv ncurses;
@ -354,9 +361,9 @@ rec {
### DEVELOPMENT ### DEVELOPMENT
binutils = useFromStdenv (stdenv ? binutils) stdenv.binutils binutils = useFromStdenv (stdenv ? binutils) stdenv.binutils
(import ../development/tools/misc/binutils { (import ../development/tools/misc/binutils {
inherit fetchurl stdenv noSysDirs; inherit fetchurl stdenv noSysDirs;
}); });
binutilsMips = (import ../development/tools/misc/binutils-cross) { binutilsMips = (import ../development/tools/misc/binutils-cross) {
inherit fetchurl stdenv noSysDirs; inherit fetchurl stdenv noSysDirs;
@ -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;
@ -468,9 +475,9 @@ rec {
}; };
gnumake = useFromStdenv (stdenv ? gnumake) stdenv.gnumake gnumake = useFromStdenv (stdenv ? gnumake) stdenv.gnumake
(import ../development/tools/build-managers/gnumake { (import ../development/tools/build-managers/gnumake {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}); });
mk = (import ../development/tools/build-managers/mk) { mk = (import ../development/tools/build-managers/mk) {
inherit fetchurl stdenv; inherit fetchurl stdenv;