Eelco Dolstra 916793cf13 Merge branch 'master' into systemd-219 ... Conflicts: nixos/modules/system/boot/systemd.nix pkgs/applications/networking/p2p/transmission/default.nix pkgs/development/libraries/libseccomp/default.nix pkgs/os-specific/linux/systemd/default.nix pkgs/top-level/all-packages.nix		2015-09-07 21:28:33 +02:00
..
applications	Merge branch 'master' into systemd-219	2015-09-07 21:28:33 +02:00
build-support	cassandra: use mirrors	2015-09-02 20:04:11 +02:00
data	geolite-legacy: update 2015-08-31 -> 2015-09-03	2015-09-03 01:17:28 +02:00
desktops	gcr: 3.14.0 -> 3.16.0, should fix race condition during build	2015-08-28 11:35:29 +02:00
development	Merge branch 'master' into systemd-219	2015-09-07 21:28:33 +02:00
games	lgogdownloader: init at 2.24, fixes #9613	2015-09-03 13:09:06 +02:00
misc	jack2: apply patch to fix build with gcc5	2015-09-03 11:22:28 -07:00
os-specific	Merge branch 'master' into systemd-219	2015-09-07 21:28:33 +02:00
servers	bind: 9.10.2-P3 -> 9.10.2-P4	2015-09-02 21:49:43 -07:00
shells	add binutils to bash build for size	2015-08-12 11:27:54 -07:00
stdenv	Don't barf JSON at users in error messages	2015-08-27 15:32:45 +02:00
test
tools	Nix: Update to 1.10	2015-09-04 10:40:08 +02:00
top-level	Merge branch 'master' into systemd-219	2015-09-07 21:28:33 +02:00