Peter Simons 52edff8689 Merge pull request #15989 from mboes/stack-builder-tweaks ... haskell.lib.buildStackProject: allow passing in a custom GHC version.		2016-06-13 12:15:11 +02:00
..
applications	Merge pull request #16159 from matthewbauer/neovim-darwin-fixes	2016-06-13 10:42:20 +02:00
build-support	nix-prefetch-git: shellcheck fixes	2016-06-12 13:45:20 +01:00
data	numix-icon-theme-circle: 2016-05-25 -> 2016-06-10	2016-06-13 10:03:24 +02:00
desktops	mate-themes: 3.18.1 -> 3.18.2, 3.20.8	2016-06-12 15:47:42 -03:00
development	Merge pull request #15989 from mboes/stack-builder-tweaks	2016-06-13 12:15:11 +02:00
games	Merge pull request #16091 from ryantm/minecraft	2016-06-11 22:35:19 +03:00
misc	numix-gtk-theme: 2016-05-25 -> 2016-06-12	2016-06-13 10:03:30 +02:00
os-specific	Merge pull request #16160 from vrthra/mupdf	2016-06-12 23:26:34 +01:00
servers	Merge pull request #8891 from mk0x9/mpd-on-darwin	2016-06-13 00:10:16 +01:00
shells	fish: fix completion from NIX_PROFILES	2016-06-12 01:16:35 -04:00
stdenv	stdenv: fix paxmark	2016-05-27 18:57:59 +02:00
test	Remove cruft	2016-04-26 17:31:54 +02:00
tools	fix build of pngcheck	2016-06-13 01:21:14 +02:00
top-level	Merge pull request #16159 from matthewbauer/neovim-darwin-fixes	2016-06-13 10:42:20 +02:00