There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
Semi-automatic update. These checks were performed:
- built on NixOS
- ran `/nix/store/6cg1sba0szxb33hhk28qxbsw5hdlsrkd-diod-1.0.24/bin/diodload help` got 0 exit code
- found 1.0.24 with grep in /nix/store/6cg1sba0szxb33hhk28qxbsw5hdlsrkd-diod-1.0.24
- found 1.0.24 in filename of file in /nix/store/6cg1sba0szxb33hhk28qxbsw5hdlsrkd-diod-1.0.24
