985d1ac425
There were several more conflicts from name -> pname+version; all auto-solved by kdiff3, hopefully OK. Hydra nixpkgs: ?compare=1538611 |
||
|---|---|---|
| .. | ||
| 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 | ||