nixpkgs/pkgs/tools/system
Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
..
acct
at
bootchart
cron
dd_rescue
ddrescue
efibootmgr
fakeroot
fcron
fdisk
freeipmi
gdmap
gptfdisk
gt5
hardlink hardlink: initial version 2012-01-30 11:40:20 +00:00
ioping
ipmitool
ipmiutil
logrotate
lshw
mcron
monit
pciutils
plan9port
setserial
sg3_utils
sleuthkit
smartmontools
suid-chroot
syslog-ng
tm
tree
ts
uptimed
vbetool
which