Jan Malakhovski 7079e744d4 Merge branch 'master' into staging ... Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix		2018-03-10 20:38:13 +00:00
..
arduino
beam-modules
bower-modules/generic
compilers	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
coq-modules	coqPackages.bignums: Change expression to match other Coq packages	2018-03-06 07:46:51 -08:00
dotnet-modules/patches
eclipse/ecj
em-modules/generic
go-modules
guile-modules
haskell-modules	haskell-hackage-db: add override to fix build with GHC 8.4.1	2018-03-10 10:00:17 +01:00
idris-modules	idrisPackages.wl-pprint: 2016-09-28 -> 2017-03-13	2018-03-09 10:22:53 +01:00
interpreters	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
java-modules
libraries	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
lisp-modules	lispPackages.xembed: init	2018-02-26 11:17:36 +01:00
lua-modules
misc	darwin: disable broken packages	2018-03-08 17:21:17 -06:00
mobile	Merge branch 'master'	2018-03-05 14:53:27 +01:00
node-packages	nodePackages_8_x.npm: init at 5.6.0	2018-03-01 18:21:49 +08:00
ocaml-modules	ocamlPackages.sawja: 1.5.2 -> 1.5.3	2018-03-09 07:53:49 +01:00
perl-modules	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
pharo
pure-modules
python-modules	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
qtcreator
r-modules	rPackages.mongolite: fix build	2018-03-10 04:01:49 +01:00
ruby-modules	rugged: fix build	2018-03-10 12:59:53 +01:00
stm32/betaflight
tools	Merge branch 'master' into staging	2018-03-10 20:38:13 +00:00
web	grails: 3.3.0 -> 3.3.2	2018-03-08 14:14:10 -08:00