Peter Simons 50b2fab866 Merge pull request #5646 from mpickering/master ... Add psqueues and slack-api haskell packages		2015-01-08 21:41:41 +01:00
..
applications	hledger-irr: broken by hledegr 0.24.	2015-01-08 20:17:04 +01:00
build-support	java: Normalize to the default jre / jdk	2015-01-07 14:55:41 -08:00
data
desktops	gnome-shell: add missing sqlite needed by libcamel	2015-01-08 12:34:12 +01:00
development	Merge pull request #5646 from mpickering/master	2015-01-08 21:41:41 +01:00
games	Merge pull request #5518 from tomberek/patch-1	2015-01-08 02:56:23 -06:00
misc	Merge pull request #5592 from AndersonTorres/fsuae	2015-01-06 09:59:56 +00:00
os-specific	Merge pull request #5603 from abbradar/iwlwifi	2015-01-08 01:53:21 +01:00
servers	Merge pull request #5618 from flosse/prosody-update	2015-01-08 01:52:50 +01:00
shells	nixpkgs: remove redundant attribute sip	2014-12-23 19:37:21 +01:00
stdenv	restore pkgs.gcc = stdenv.cc	2015-01-03 09:54:02 -05:00
test
tools	unzip: Patch for CVE-2014-81{39,40,41}.	2015-01-08 11:29:40 -08:00
top-level	Merge pull request #5646 from mpickering/master	2015-01-08 21:41:41 +01:00