Shea Levy 794edf60cd Merge branch 'nixos-master-test' of git://github.com/copumpkin/nixpkgs		2015-02-08 22:37:46 -05:00
..
applications	Purification in preparation for pure-darwin merge (shouldsn't hurt anything in the meantime)	2015-02-08 19:15:09 -05:00
build-support	Merge pull request #6245 from edwtjo/samba-collate-urls	2015-02-08 13:38:01 -08:00
data	symbola: update to 7.19 ; fixes wrong hash.	2015-02-08 20:26:59 +01:00
desktops	e19: updates (close #6003)	2015-02-04 22:20:31 +01:00
development	Fix boost 1.55 on clang (1.56 onwards already have the fix)	2015-02-08 22:19:04 -05:00
games	instead: update from 2.2.1 to 2.2.2	2015-02-07 12:47:42 +01:00
misc	vimplugins: update vim2nix and VAM	2015-02-09 01:43:24 +03:00
os-specific	Merge pull request #5530 from abbradar/ibt-hw	2015-02-08 14:59:09 -08:00
servers	Merge pull request #6245 from edwtjo/samba-collate-urls	2015-02-08 13:38:01 -08:00
shells	Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'	2015-02-02 21:14:28 -05:00
stdenv	move libcxx[abi] into llvm tree	2015-02-03 14:58:10 -08:00
test
tools	Fix grub1 support	2015-02-08 22:28:42 -05:00
top-level	Merge pull request #5994 from ts468/grub	2015-02-08 14:18:13 -08:00