nixpkgs/pkgs/tools
Peter Simons f67d5a9a39 Merge branch 'master' into stdenv-updates.
Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
..
admin Update TigerVNC to SVN checkout that at least builds.. 2012-10-18 20:49:22 +04:00
archivers Merge branch 'master' into stdenv-updates. 2012-11-21 16:20:36 +01:00
backup Merge branch 'master' of github.com:NixOS/nixpkgs 2012-10-21 03:04:22 +02:00
bluetooth Update Bluez/Obex 2012-10-29 23:56:26 +04:00
cd-dvd * Add bchunk. 2012-06-17 03:36:22 +00:00
compression xz: Update to 5.0.4 2012-09-18 14:52:41 -04:00
filesystems btrfsprogs: upgrade to current version (0.20 pre) 2012-10-09 16:05:24 +02:00
graphics graphviz: patch broken cdt.h header file 2012-11-11 20:16:21 +01:00
misc Merge branch 'master' into stdenv-updates. 2012-11-21 16:20:36 +01:00
networking Merge branch 'master' into stdenv-updates. 2012-11-21 16:20:36 +01:00
package-management nix: Update to 1.2pre2980 2012-11-20 12:12:24 +01:00
security gpg/pth: fixing the pth building on arm 2012-11-15 12:38:18 +01:00
system smartmontools: update drivedb file to trunk revision 3605 2012-11-20 11:16:32 +01:00
text patch: Update to 2.7.1 2012-10-16 15:05:39 -04:00
typesetting asciidoc: update to version 8.6.8 2012-10-23 19:48:51 +02:00
video Updating rtmpdump to the 2.4 (what I think it is 2.4) in their git repository. 2011-09-25 09:04:24 +00:00
virtualization ec2-api-tools: Update to 1.6.5.1 2012-11-08 16:31:08 +01:00
X11 xdg-utils: Fix reference to /usr/bin/file in xdg-mime 2012-10-04 13:38:26 +02:00