Tuomas Tynkkynen 067d1cf330 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/applications/science/math/sage/sage-src.nix		2018-10-27 19:58:03 +03:00
..
bsd	netbsd: misc cleanups	2018-10-07 22:33:18 -05:00
darwin	goku: init 0.1.11	2018-10-27 16:15:36 +01:00
linux	Merge remote-tracking branch 'upstream/master' into staging	2018-10-27 19:58:03 +03:00
windows	treewide: Remove usage of remaining redundant platform compatability stuff	2018-08-30 17:20:32 -04:00