John Wiegley 61176d8987 Revert "haskellPackages.git-annex: Do not use lsof on Darwin" ... This reverts commit fd45c7b82b.		2015-12-16 16:20:44 -08:00
..
applications	Merge pull request #11769 from Profpatsch/cutegram	2015-12-16 17:41:30 -06:00
build-support	add copyPathToStore and copyPathsToStore	2015-12-16 15:00:44 -06:00
data	font-droid: fix srcs urls	2015-12-10 05:45:24 +01:00
desktops	plasma55.plasma-workspace: update patches	2015-12-16 15:46:38 -06:00
development	Revert "haskellPackages.git-annex: Do not use lsof on Darwin"	2015-12-16 16:20:44 -08:00
games	tome4: 1.3.1 -> 1.3.3	2015-12-16 15:24:03 -05:00
misc	Merge pull request #11338 from obadz/light-locker	2015-12-16 13:45:05 +00:00
os-specific	add numad: daemon that manages application locality	2015-12-15 23:41:43 +01:00
servers	riak: fix leveldb hash, fixes #11731	2015-12-16 23:07:22 +01:00
shells	mksh: maintainers += nckx	2015-12-14 23:34:34 +01:00
stdenv	allow{reason}: a bit more explicit error message	2015-12-09 17:01:46 +01:00
test
tools	Merge pull request #11757 from rycee/fix/colordiff	2015-12-17 01:12:05 +01:00
top-level	Add LTS Haskell 3.18.	2015-12-17 00:32:16 +01:00