_1126 33e9f3192d Merge remote-tracking branch 'upstream/master'		2014-07-17 13:47:37 +02:00
..
applications	Merge remote-tracking branch 'upstream/master'	2014-07-17 13:47:37 +02:00
build-support	Separate fetchgitPrivate into a separate file	2014-07-16 18:05:56 -04:00
data	tzdata: Update to 2014e	2014-07-08 18:35:40 +02:00
desktops	gtksourceview 3.12: hard code data dirs to nix store path	2014-07-13 16:32:41 +02:00
development	openjdk: Update to 7u65-b32	2014-07-17 13:09:20 +02:00
games	Add "please don't edit" comment at the top of every auto-generated Haskell file.	2014-07-14 13:21:41 +02:00
misc	my-env: Support for running command directly by load-env-xxx script	2014-07-16 23:09:49 +02:00
os-specific	linux: only enable CONFIG_NFS_SWAP for v3.6+ kernels	2014-07-16 12:13:06 +02:00
servers	Merge pull request #3285 from ehmry/polipo	2014-07-16 18:29:11 +02:00
shells	fish: fix 'fish_config' by providing python ncurses module	2014-06-30 20:39:02 +02:00
stdenv	Don't suggest using --arg config '{ allowUnfree = true; }'	2014-06-17 15:00:24 -05:00
test
tools	efibootmgr: Update 0.5.4 -> 0.7.0	2014-07-17 11:40:37 +02:00
top-level	Add Light Table editor.	2014-07-17 12:25:22 +02:00