Tuomas Tynkkynen 747ebe3f66 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/top-level/all-packages.nix		2018-04-03 02:22:54 +03:00
..
biology	htslib: 1.6 -> 1.7	2018-02-06 15:37:50 +01:00
math	Merge remote-tracking branch 'upstream/master' into staging	2018-04-03 02:22:54 +03:00
robotics/ispike	iSpike: init at 2.1.1	2016-04-12 14:36:20 +02:00