1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-03 11:02:05 +00:00
nixpkgs/pkgs/applications/backup
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
..
areca areca: fix build 2019-03-09 12:52:34 +01:00
crashplan gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
deja-dup gnome-online-accounts: move from gnome3 2019-08-23 02:47:21 +02:00
vdmfec treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00