Tuomas Tynkkynen e2c6740c37 Merge commit 'adaee73' from staging into master ... This one was already merged into release-16.09, so let's not have the stable branch is ahead of master and confuse things. In addition to that, currently we have an odd situation that master has less things actually finished building than in staging. Conflicts: pkgs/data/documentation/man-pages/default.nix		2016-09-03 01:02:51 +03:00
..
arduino	arduino: only build on linux	2016-08-10 22:29:58 -05:00
beam-modules	build-rebar3: Append postPatch to original hook	2016-08-29 23:31:50 +02:00
bower-modules/generic
compilers	openjdk: Keep {include,man} in $out/lib/opendjk. (#18140)	2016-09-01 21:00:41 +02:00
coq-modules
dotnet-modules/patches
eclipse
em-modules/generic
go-modules	go: Split output order to match new convention	2016-08-31 13:55:40 +03:00
guile-modules	treewide: Add lots of meta.platforms	2016-08-02 21:42:43 +03:00
haskell-modules	Merge staging into master	2016-09-01 13:27:27 +03:00
idris-modules
interpreters	Merge commit 'adaee73' from staging into master	2016-09-03 01:02:51 +03:00
libraries	Merge commit 'adaee73' from staging into master	2016-09-03 01:02:51 +03:00
lisp-modules	treewide: fixup various mysql ocurrences after re-split	2016-08-07 20:46:37 +02:00
lua-modules
misc
mobile	adb-sync: init at 2016-08-31	2016-09-02 16:44:41 +02:00
node-packages	nodePackages: add svgo	2016-09-02 13:01:51 +00:00
ocaml-modules	ocamlPackages.menhir: remove unnecessary substitution	2016-08-29 01:28:15 +00:00
perl-modules	docdev -> devdoc	2016-09-01 11:07:23 +02:00
pharo	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-07-21 00:56:43 +00:00
pure-modules	treewide: fixup various mysql ocurrences after re-split	2016-08-07 20:46:37 +02:00
python-modules	Merge commit 'adaee73' from staging into master	2016-09-03 01:02:51 +03:00
qtcreator
r-modules	treewide: Add lots of platforms to packages with no meta	2016-08-02 21:17:44 +03:00
ruby-modules	Revert "bundix: 2.2.0"	2016-09-02 16:00:45 -04:00
tools	flow: Broken on i686	2016-09-02 18:54:39 +03:00
web	remarkjs: use node2nix generated expressions	2016-09-02 13:02:37 +00:00