Vladimír Čunát adab4cd58b Merge branch 'master' into staging		2017-02-03 11:47:38 +01:00
..
applications	Merge branch 'master' into staging	2017-02-03 11:47:38 +01:00
build-support	Add a pkgs.dhallToNix utility	2017-01-26 20:11:49 -08:00
data	callHackage: update Hackage snapshot to a current version	2017-01-31 22:50:18 +01:00
desktops	Merge branch 'master' into staging	2017-02-03 11:47:38 +01:00
development	Merge branch 'master' into staging	2017-02-03 11:47:38 +01:00
games	Merge branch 'master' into staging	2017-02-03 11:47:38 +01:00
misc	Merge branch 'master' into staging	2017-02-03 11:47:38 +01:00
os-specific	Merge branch 'master' into staging	2017-02-03 11:47:38 +01:00
servers	Merge pull request #22398 from MP2E/pulse_update	2017-02-03 02:35:21 -05:00
shells	es: add ttuegel to maintainers	2017-01-31 07:54:36 -06:00
stdenv	~/.nixpkgs -> ~/.config/nixpkgs	2017-02-01 16:07:55 +01:00
test
tools	Merge branch 'master' into staging	2017-02-03 11:47:38 +01:00
top-level	Merge branch 'master' into staging	2017-02-03 11:47:38 +01:00