zimbatm e892c52737 Merge pull request #15300 from sorpaas/fix-firefox ... calibre: Fix file already exists building problem		2016-05-08 14:33:34 +01:00
..
applications	Merge pull request #15300 from sorpaas/fix-firefox	2016-05-08 14:33:34 +01:00
build-support	Merge #14920: windows improvements, mainly mingw	2016-05-05 08:30:19 +02:00
data	Merge #14920: windows improvements, mainly mingw	2016-05-05 08:30:19 +02:00
desktops	Merge #14920: windows improvements, mainly mingw	2016-05-05 08:30:19 +02:00
development	Merge commit 'refs/pull/14568/head' of git://github.com/NixOS/nixpkgs into staging	2016-05-07 03:44:06 +03:00
games	Merge #14920: windows improvements, mainly mingw	2016-05-05 08:30:19 +02:00
misc	use dontBuild instead of hacks	2016-05-04 10:11:04 +00:00
os-specific	Merge #15048: util-linux: 2.27.1 -> 2.28	2016-05-07 11:16:57 +02:00
servers	use dontBuild instead of hacks	2016-05-04 10:11:04 +00:00
shells	Merge remote-tracking branch 'upstream/master' into staging	2016-05-03 23:12:48 +03:00
stdenv	stdenv substituteAll: use more robust code	2016-05-07 11:23:30 +02:00
test	Remove cruft	2016-04-26 17:31:54 +02:00
tools	bzip2: greatly simplify by using autoconfiscated version	2016-05-05 08:31:09 +02:00
top-level	Merge #14920: windows improvements, mainly mingw	2016-05-05 08:30:19 +02:00