985d1ac425
There were several more conflicts from name -> pname+version; all auto-solved by kdiff3, hopefully OK. Hydra nixpkgs: ?compare=1538611 |
||
|---|---|---|
| .. | ||
| bash-completion | ||
| nix-bash-completions | ||
| 4.4.nix | ||
| 5.0.nix | ||
| bash-4.4-patches.nix | ||
| bash-5.0-patches.nix | ||
| cygwin-bash-4.4.11-2.src.patch | ||
| update-patch-set.sh | ||