diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:19:05 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:55:37 +0200 |
| commit | 2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1 (patch) | |
| tree | 36de0660dc2c9f3731bd8b60ec852ca0c452efce /pkgs/applications/virtualization/virt-manager | |
| parent | 84a91208a948be5eca97ea182c4256d9d6ecf171 (diff) | |
| parent | 8943fb5f24b9e1aa1d577be4e214d166643269fd (diff) | |
| download | nixlib-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar nixlib-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar.gz nixlib-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar.bz2 nixlib-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar.lz nixlib-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar.xz nixlib-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.tar.zst nixlib-2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1.zip | |
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
Diffstat (limited to 'pkgs/applications/virtualization/virt-manager')
| -rw-r--r-- | pkgs/applications/virtualization/virt-manager/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index b6a6ebde5409..42860966fe11 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -77,6 +77,6 @@ python3Packages.buildPythonApplication rec { license = licenses.gpl2; # exclude Darwin since libvirt-glib currently doesn't build there platforms = platforms.linux; - maintainers = with maintainers; [ qknight offline fpletz ]; + maintainers = with maintainers; [ qknight offline fpletz globin ]; }; } |