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
..
001_mx.py.patch
002_setjmp.c.patch
003_mx_truffle.py.patch
004_mx_jvmci.py.patch
default.nix
enterprise-edition.nix
truffle.make