nixpkgs/pkgs/applications/networking/instant-messengers/riot
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
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
2019-08-24 08:55:37 +02:00
..
riot-desktop-package.json riot-desktop: 1.3.0 -> 1.3.3 2019-08-22 21:51:50 +02:00
riot-desktop-yarndeps.nix riot-desktop: use own yarn2nix 2019-03-30 23:57:59 +01:00
riot-desktop.nix riot-desktop: 1.3.0 -> 1.3.3 2019-08-22 21:51:50 +02:00
riot-web.nix Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
yarn2nix.nix treewide: remove unused variables (#63177) 2019-06-16 19:59:05 +00:00