3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/applications/video/mpv
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
..
scripts gobject-introspection: rename package 2018-12-02 12:42:29 +01:00
default.nix Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
wrapper.nix mpv: use wrapper for scripts and add mpris script 2018-07-19 09:50:32 +02:00