Frederik Rietdijk 318a89f691 Merge pull request #12916 from NixOS/python-wip ... pythonPackages: fixes		2016-02-10 09:28:55 +01:00
..
applications	Merge pull request #12889 from zimbatm/atom-1.4.3	2016-02-09 20:54:18 +03:00
build-support	fetchgitlocal: be less chatty	2016-02-01 10:57:01 -08:00
data	geolite-legacy 2016-02-02 -> 2016-02-08	2016-02-08 19:15:41 +01:00
desktops	gtkglext: propagate pangox-compat dependency	2016-02-06 05:18:40 +03:00
development	hackage-packages.nix: update Haskell package set	2016-02-09 12:00:07 +01:00
games	dwarf-fortress: fix help	2016-02-07 15:55:06 +03:00
misc	Merge pull request #12859 from seagreen/vinegar-vim-plugin	2016-02-08 19:17:50 +03:00
os-specific	Merge pull request #12911 from tg-x/grsec-url	2016-02-09 23:45:08 -05:00
servers	Merge pull request #12781 from tvon/plex	2016-02-03 18:31:34 +03:00
shells	fish: don't use manpath(1) from PATH in functions/man.fish	2016-02-02 06:13:12 +01:00
stdenv	Merge branch 'master' into staging	2016-01-18 09:48:49 +01:00
test
tools	Merge pull request #12899: beets: 1.3.16 -> 1.3.17	2016-02-10 02:46:58 +01:00
top-level	Merge pull request #12916 from NixOS/python-wip	2016-02-10 09:28:55 +01:00