obadz 3de6e5be50 Merge branch 'master' into staging ... Conflicts: pkgs/applications/misc/navit/default.nix pkgs/applications/networking/mailreaders/alpine/default.nix pkgs/applications/networking/mailreaders/realpine/default.nix pkgs/development/compilers/ghc/head.nix pkgs/development/libraries/openssl/default.nix pkgs/games/liquidwar/default.nix pkgs/games/spring/springlobby.nix pkgs/os-specific/linux/kernel/perf.nix pkgs/servers/sip/freeswitch/default.nix pkgs/tools/archivers/cromfs/default.nix pkgs/tools/graphics/plotutils/default.nix		2016-08-27 23:54:54 +01:00
..
altcoins	treewide: Add lots of meta.platforms	2016-08-02 21:42:43 +03:00
audio	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
backup	treewide: Use more makeLibraryPath	2016-08-23 02:56:12 +03:00
display-managers	sddm: run phase hooks	2016-06-09 12:39:02 -05:00
editors	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
gis	treewide: fixup various mysql ocurrences after re-split	2016-08-07 20:46:37 +02:00
graphics	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
inferno
misc	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
networking	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
office	Merge pull request #18037 from patjouk/update-jabref	2016-08-27 17:48:33 +02:00
science	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
search	Remove pycairo from top-level	2016-08-14 13:52:42 +02:00
taxes
version-management	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
video	Merge branch 'master' into staging	2016-08-27 23:54:54 +01:00
virtualization	xen: remove obsolete substituteInPlace	2016-08-27 21:54:30 +00:00
window-managers	Merge branch 'master' into staging	2016-08-24 11:57:44 +01:00