From a1250fe8b2b7f84721735c8462fb9ffe8f123f39 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 11 Sep 2022 09:31:32 +0300 Subject: [PATCH] virt-manager: 4.0.0 -> 4.1.0 --- .../virtualization/virt-manager/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 65bd4bcecb44..03aba1c41218 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonApplication rec { pname = "virt-manager"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-3ycXNBuf91kI2cJCRw0ZzaWkaIVwb/lmkOKeHNwpH9Y="; + hash = "sha256-UgZ58WLXq0U3EDt4311kv0kayVU17In4kwnQ+QN1E7A="; }; nativeBuildInputs = [ @@ -33,16 +33,6 @@ python3.pkgs.buildPythonApplication rec { pygobject3 libvirt libxml2 requests cdrtools ]; - patches = [ - # due to a recent change in setuptools-61, "packages=[]" needs to be included - # this patch can hopefully be removed, once virt-manager has an upstream version bump - (fetchpatch { - name = "fix-for-setuptools-61.patch"; - url = "https://github.com/virt-manager/virt-manager/commit/46dc0616308a73d1ce3ccc6d716cf8bbcaac6474.patch"; - sha256 = "sha256-/RZG+7Pmd7rmxMZf8Fvg09dUggs2MqXZahfRQ5cLcuM="; - }) - ]; - postPatch = '' sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py sed -i "/'install_egg_info'/d" setup.py @@ -80,6 +70,8 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ "testAlterDisk" "test_misc_nonpredicatble_generate" + "test_disk_dir_searchable" # does something strange with permissions + "testCLI0001virt_install_many_devices" # expects /var to exist ]; preCheck = ''