Vladimír Čunát 985d1ac425 Merge branch 'master' into staging-next ... There were several more conflicts from name -> pname+version; all auto-solved by kdiff3, hopefully OK. Hydra nixpkgs: ?compare=1538611		2019-08-25 14:57:11 +02:00
..
androidndk-pkgs
arduino
beam-modules
bower-modules/generic
compilers	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
coq-modules
dhall-modules
dotnet-modules/patches
em-modules/generic
go-modules
go-packages
guile-modules
haskell-modules	Merge remote-tracking branch 'origin/master' into openssl-1.1	2019-08-23 17:27:39 +02:00
idris-modules
interpreters	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
java-modules
libraries	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
lisp-modules
lua-modules
misc	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
mobile	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
node-packages
ocaml-modules	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
perl-modules
pharo
pure-modules
python-modules	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
r-modules
ruby-modules
tools	Merge branch 'master' into staging-next	2019-08-25 14:57:11 +02:00
web	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00