nixpkgs/pkgs/applications/networking/instant-messengers/rambox
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
..
sencha treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
bare.nix treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
default.nix treewide: use dontUnpack 2019-07-01 04:23:51 -04:00
fetchNodeModules.nix rambox: build from source 2017-11-03 20:02:23 +00:00
isDev.patch rambox: build from source 2017-11-03 20:02:23 +00:00
pro.nix rambox-pro: 1.1.4 -> 1.1.6 2019-08-20 14:55:29 -07:00