nixpkgs-suyu/pkgs/tools
Vladimír Čunát 1e389c976c merge 'staging' into modular-stdenv
In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix
2014-09-08 18:16:54 +02:00
..
admin sec: update to version 2.7.6 2014-07-30 16:11:52 +02:00
archivers Remove addHook 2014-08-09 12:45:53 +02:00
audio mpdcron: add expression 2014-05-23 08:39:28 +10:00
backup obnam: Update from 1.6.1 to 1.8 2014-08-12 13:32:24 +02:00
bluetooth Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
cd-dvd Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
compression Merge branch 'master' into staging 2014-08-14 23:09:59 +02:00
filesystems Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
graphics pngout: Create new package 2014-08-14 15:59:50 +02:00
inputmethods/fcitx Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
misc plowshare: version bump 2014-08-15 00:25:45 +02:00
networking dhcp: Update meta information and add maintainership 2014-08-13 15:10:04 -05:00
package-management Fixed deterministicness of fetchgit with leaveDotGit 2014-08-10 16:25:29 +02:00
security tboot: security update to 1.8.2 (close #3562) 2014-08-14 14:23:44 +02:00
system plan9port: fix eval (license typo) 2014-08-15 02:06:45 +02:00
text merge 'staging' into modular-stdenv 2014-09-08 18:16:54 +02:00
typesetting merge 'staging' into modular-stdenv 2014-09-08 18:16:54 +02:00
video Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
virtualization ec2-ami-tools: Update from 1.4.0.9 to 1.5.3 2014-08-05 01:25:16 +02:00
X11 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00