Peter Simons 956c1fe3e8 Merge pull request #22427 from 3noch/fix-callCabal2nix ... haskellPackages.callCabal2nix: provide fallback name		2017-02-05 19:37:19 +01:00
..
applications	Merge pull request #22432 from peterhoeg/d/freerdp	2017-02-05 17:08:19 +01:00
build-support	Add a pkgs.dhallToNix utility	2017-01-26 20:11:49 -08:00
data	liberastika: init at 1.1.5 (#22420)	2017-02-04 16:38:01 +01:00
desktops	Merge pull request #22432 from peterhoeg/d/freerdp	2017-02-05 17:08:19 +01:00
development	Merge pull request #22427 from 3noch/fix-callCabal2nix	2017-02-05 19:37:19 +01:00
games	Merge branch 'staging'	2017-02-04 21:02:46 +01:00
misc	Merge branch 'staging'	2017-02-04 21:02:46 +01:00
os-specific	Merge pull request #22353 from abbradar/bluetooth	2017-02-05 13:18:48 +03:00
servers	Merge pull request #22444 from Ralith/matrix-synapse	2017-02-05 04:04:11 -05:00
shells	fish: 2.3.1 -> 2.5.0	2017-02-04 20:58:55 +01:00
stdenv	make-bootstrap-tools{,-cross}.nix: Fix build after binutils changes	2017-02-04 23:39:25 +02:00
test
tools	rrdtool: 1.5.6 -> 1.6.0	2017-02-05 19:06:29 +01:00
top-level	Merge pull request #22432 from peterhoeg/d/freerdp	2017-02-05 17:08:19 +01:00