Austin Seipp d7de6dad5f Merge pull request #7755 from Lassulus/gitolite-update ... Gitolite update		2015-05-25 10:02:56 -05:00
..
applications	Merge pull request #7755 from Lassulus/gitolite-update	2015-05-25 10:02:56 -05:00
build-support	Merge 'master' into staging	2015-05-24 20:39:58 +02:00
data	geolite-legacy -> 2015-05-20	2015-05-20 16:42:38 +02:00
desktops	goffice: update	2015-05-24 19:53:34 +02:00
development	cabal2nix: update to version 20150525	2015-05-25 15:00:07 +02:00
games	xbomb: add version 2.2b	2015-05-24 14:24:33 +00:00
misc	Refactor mkFlag / shouldUsePkg into the nixpkgs libraries	2015-05-22 13:26:55 -07:00
os-specific	statifier 1.6.15 -> 1.7.3	2015-05-25 13:35:55 +02:00
servers	Merge pull request #7978 from benley/prometheus	2015-05-25 01:52:49 +03:00
shells	fish: dont demand man-db on darwin since we cant build it	2015-05-23 13:48:54 -07:00
stdenv	Refactor mkFlag / shouldUsePkg into the nixpkgs libraries	2015-05-22 13:26:55 -07:00
test
tools	tidy-html5: added package, also provides libtidy5	2015-05-25 15:05:05 +02:00
top-level	Merge branch 'master' of github.com:NixOS/nixpkgs	2015-05-25 15:32:57 +02:00