nixpkgs/pkgs/os-specific
Eelco Dolstra 01f19f54e0 Merge remote-tracking branch 'origin/master' into systemd-219
Conflicts:
	pkgs/os-specific/linux/systemd/fixes.patch
	pkgs/os-specific/linux/upower/0.99.nix
	pkgs/top-level/all-packages.nix
2015-09-21 12:57:30 +02:00
..
darwin Revert "libsecurity_generic: add El Capitan impure-deps" 2015-09-12 11:59:08 -07:00
gnu samba: Revert style changes and get rid of some dependencies 2015-06-01 15:35:59 +02:00
linux Merge remote-tracking branch 'origin/master' into systemd-219 2015-09-21 12:57:30 +02:00
windows libgcrypt: Massive cleanup and make 1.6 the default 2015-05-01 17:41:42 -07:00