From 5b640bfd089904bfe806606b8b29de5f0846bfce Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 29 Oct 2019 13:25:32 +0100
Subject: [PATCH] virtmanager{,-qt}: rename to `virt-manager{,-qt}`
Both the executable and the derivation's pname are named `virt-manager`,
however the attribute name is named `virtmanager` which is pretty
confusing when e.g. using this package with `nix run`.
Thus I renamed the package accordingly and added aliases for
backwards-compatibility (both attributes aren't used somewhere else
in nixpkgs, so the rename should be fine).
Also several other distros use `virt-manager` as package name like
Arch[1], Debian[2] or Fedora[3].
[1] https://www.archlinux.org/packages/community/any/virt-manager/
[2] https://packages.debian.org/buster/virt-manager
[3] https://apps.fedoraproject.org/packages/virt-manager
---
pkgs/top-level/aliases.nix | 2 ++
pkgs/top-level/all-packages.nix | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 02f2d18ad359..d443f81d44bd 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -397,6 +397,8 @@ mapAliases ({
vimbWrapper = vimb; # added 2015-01
vimprobable2Wrapper = vimprobable2; # added 2015-01
virtviewer = virt-viewer; # added 2015-12-24
+ virtmanager = virt-manager; # added 2019-10-29
+ virtmanager-qt = virt-manager-qt; # added 2019-10-29
vorbisTools = vorbis-tools; # added 2016-01-26
webkit = webkitgtk; # added 2019-03-05
weechat-matrix-bridge = weechatScripts.weechat-matrix-bridge; # added 2018-09-06
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2a80fdc0b64..58f114d1b1ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21371,12 +21371,12 @@ in
virt-what = callPackage ../applications/virtualization/virt-what { };
- virtmanager = callPackage ../applications/virtualization/virt-manager {
+ virt-manager = callPackage ../applications/virtualization/virt-manager {
dconf = gnome3.dconf;
system-libvirt = libvirt;
};
- virtmanager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix {
+ virt-manager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix {
qtermwidget = lxqt.qtermwidget;
};