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	graalvm: rc15->19.0.0	2019-05-14 16:13:31 +02:00
002_setjmp.c.patch
003_mx_truffle.py.patch
004_mx_jvmci.py.patch
default.nix	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
enterprise-edition.nix	graalvm8-ee: 19.1.1 -> 19.2.0	2019-08-22 20:26:25 +00:00
truffle.make