* Improve indentation.

svn path=/nixpkgs/trunk/; revision=12184
This commit is contained in:
Eelco Dolstra 2008-06-25 10:58:44 +00:00
parent fde0ce5023
commit a6ecd844f0

View File

@ -2,310 +2,320 @@ let
allPackages = import ./all-packages.nix; allPackages = import ./all-packages.nix;
i686LinuxPkgs = {inherit (allPackages {system = "i686-linux";}) i686LinuxPkgs = {
MPlayer inherit (allPackages {system = "i686-linux";})
MPlayerPlugin MPlayer
alsaUtils MPlayerPlugin
apacheAnt alsaUtils
apacheHttpd apacheAnt
aspectj apacheHttpd
aspell aspectj
aspellDicts aspell
aterm aspellDicts
audacious aterm
audacious_plugins audacious
autoconf audacious_plugins
automake19x autoconf
bash automake19x
bashInteractive bash
batik bashInteractive
binutils batik
bison23 binutils
bittorrent bison23
bsdiff bittorrent
bzip2 bsdiff
cabextract bzip2
cdrkit cabextract
#chatzilla cdrkit
cksfv #chatzilla
#compiz cksfv
coreutils #compiz
cpio coreutils
cron cpio
cups cron
#darcs cups
db4 #darcs
dhcp db4
dietlibc dhcp
diffutils dietlibc
docbook5 diffutils
docbook5_xsl docbook5
docbook_xml_dtd_42 docbook5_xsl
docbook_xml_dtd_43 docbook_xml_dtd_42
docbook_xsl docbook_xml_dtd_43
e2fsprogs docbook_xsl
ecj e2fsprogs
eclipsesdk ecj
emacs eclipsesdk
emacsUnicode emacs
enscript emacsUnicode
exult enscript
feh exult
file feh
findutils file
firefox findutils
flex2533 firefox
gawk flex2533
gcc gawk
gcc34 gcc
gcc42 gcc34
gdb gcc42
ghc gdb
ghostscript ghc
gimp ghostscript
gnugrep gimp
gnum4 gnugrep
gnumake gnum4
gnupatch gnumake
gnused gnupatch
gnutar gnused
gqview gnutar
graphviz gqview
grub graphviz
gzip grub
hal gzip
hello hal
iana_etc hello
iputils iana_etc
irssi iputils
jakartaregexp irssi
jdkPlugin jakartaregexp
jetty jdkPlugin
jikes jetty
jing_tools jikes
jrePlugin jing_tools
jwhois jrePlugin
kbd jwhois
kcachegrind kbd
kdebase kcachegrind
keen4 kdebase
ktorrent keen4
kvm ktorrent
less kvm
lhs2tex less
libtool lhs2tex
libxml2 libtool
libxslt libxml2
lvm2 libxslt
lynx lvm2
man lynx
mdadm man
mesa mdadm
mingetty mesa
mk mingetty
mktemp mk
mod_python mktemp
module_init_tools mod_python
mono module_init_tools
mysql mono
#mythtv mysql
nano #mythtv
netcat nano
nix netcat
nixUnstable nix
nss_ldap nixUnstable
ntp nss_ldap
nxml ntp
#openoffice nxml
openssh #openoffice
openssl openssh
pam_console openssl
pam_ldap pam_console
pam_login pam_ldap
pam_unix2 pam_login
pan pam_unix2
par2cmdline pan
pciutils par2cmdline
perl pciutils
php perl
pidgin php
pkgconfig pidgin
postgresql pkgconfig
postgresql_jdbc postgresql
procps postgresql_jdbc
pwdutils procps
python pwdutils
qt3 python
#quake3demo qt3
readline #quake3demo
reiserfsprogs readline
rogue reiserfsprogs
rsync rogue
ruby rsync
screen ruby
sdf screen
slim sdf
spidermonkey slim
ssmtp spidermonkey
strace ssmtp
strategoxt strace
strategoxtUtils strategoxt
su strategoxtUtils
subversion su
sudo subversion
swig sudo
sylpheed swig
sysklogd sylpheed
syslinux sysklogd
sysvinit syslinux
sysvtools sysvinit
tetex sysvtools
texinfo tetex
thunderbird texinfo
tightvnc thunderbird
time tightvnc
udev time
uml udev
unzip uml
upstart unzip
utillinux upstart
valgrind utillinux
vim valgrind
vlc vim
w3m vlc
wget w3m
wine wget
wirelesstools wine
wxHaskell wirelesstools
x11_ssh_askpass wxHaskell
xchm x11_ssh_askpass
xfig xchm
xineUI xfig
xkeyboard_config xineUI
xmltv xkeyboard_config
xorg_sys_opengl xmltv
xsel xorg_sys_opengl
xterm xsel
zdelta xterm
zip zdelta
; zip
inherit ((allPackages {system = "i686-linux";}).xorg) ;
fontbh100dpi inherit ((allPackages {system = "i686-linux";}).xorg)
fontbhlucidatypewriter100dpi fontbh100dpi
fontbhttf fontbhlucidatypewriter100dpi
fontcursormisc fontbhttf
fontmiscmisc fontcursormisc
iceauth fontmiscmisc
setxkbmap iceauth
xauth setxkbmap
xf86inputkeyboard xauth
xf86inputmouse xf86inputkeyboard
xf86videoi810 xf86inputmouse
xf86videovesa xf86videoi810
xkbcomp xf86videovesa
xorgserver xkbcomp
xrandr xorgserver
xrdb xrandr
xset xrdb
; xset
inherit ((allPackages {system = "i686-linux";}).gnome) ;
gconfeditor inherit ((allPackages {system = "i686-linux";}).gnome)
gnomepanel gconfeditor
gnometerminal gnomepanel
gnomeutils gnometerminal
metacity gnomeutils
; metacity
inherit ((allPackages {system = "i686-linux";}).kernelPackages_2_6_23) ;
iwlwifi inherit ((allPackages {system = "i686-linux";}).kernelPackages_2_6_23)
kernel iwlwifi
klibc kernel
splashutils klibc
; splashutils
;
kernelNew = ((allPackages {system = "i686-linux";}).kernelPackages_2_6_25).kernel; kernelNew = ((allPackages {system = "i686-linux";}).kernelPackages_2_6_25).kernel;
}; };
x86_64LinuxPkgs = {inherit (allPackages {system = "x86_64-linux";}) x86_64LinuxPkgs = {
MPlayer inherit (allPackages {system = "x86_64-linux";})
MPlayerPlugin MPlayer
aterm242fixes MPlayerPlugin
autoconf aterm242fixes
automake19x autoconf
bash automake19x
binutils bash
bison23 binutils
emacs bison23
firefox emacs
gcc firefox
hello gcc
libtool hello
nixUnstable libtool
subversion nixUnstable
pan subversion
; pan
inherit ((allPackages {system = "i686-linux";}).kernelPackages_2_6_23) ;
iwlwifi inherit ((allPackages {system = "i686-linux";}).kernelPackages_2_6_23)
kernel iwlwifi
; kernel
inherit ((allPackages {system = "i686-linux";}).xorg) ;
xorgserver inherit ((allPackages {system = "i686-linux";}).xorg)
; xorgserver
;
}; };
i686FreeBSDPkgs = {inherit (allPackages {system = "i686-freebsd";}) i686FreeBSDPkgs = {
aterm inherit (allPackages {system = "i686-freebsd";})
autoconf aterm
#automake19x autoconf
curl #automake19x
docbook5 curl
docbook_xml_dtd_42 docbook5
docbook_xml_dtd_43 docbook_xml_dtd_42
docbook_xsl docbook_xml_dtd_43
docbook5_xsl docbook_xsl
libtool docbook5_xsl
libxml2 libtool
libxslt libxml2
nxml libxslt
subversion nxml
unzip subversion
;}; unzip
;
};
powerpcDarwinPkgs = {inherit (allPackages {system = "powerpc-darwin";}) powerpcDarwinPkgs = {
apacheHttpd inherit (allPackages {system = "powerpc-darwin";})
aterm apacheHttpd
autoconf aterm
#automake19x autoconf
bison23 #automake19x
docbook5 bison23
docbook_xml_dtd_42 docbook5
docbook_xml_dtd_43 docbook_xml_dtd_42
docbook_xsl docbook_xml_dtd_43
docbook5_xsl docbook_xsl
libtool docbook5_xsl
libxml2 libtool
libxslt libxml2
nxml libxslt
#php nxml
subversion #php
#tetex subversion
unzip #tetex
;}; unzip
;
};
i686DarwinPkgs = {inherit (allPackages {system = "i686-darwin";}) i686DarwinPkgs = {
aterm inherit (allPackages {system = "i686-darwin";})
autoconf aterm
automake19x autoconf
libtool automake19x
libxml2 libtool
libxslt libxml2
subversion libxslt
;}; subversion
;
};
cygwinPkgs = {inherit (allPackages {system = "i686-cygwin";}) cygwinPkgs = {
aterm inherit (allPackages {system = "i686-cygwin";})
gnum4 aterm
readline gnum4
ncurses readline
;}; ncurses
;
};
in [ in [
i686LinuxPkgs i686LinuxPkgs