![]() 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 |
||
---|---|---|
.. | ||
riot-desktop-package.json | ||
riot-desktop-yarndeps.nix | ||
riot-desktop.nix | ||
riot-web.nix | ||
yarn2nix.nix |