From 911f408b5eec933ad0adbd296458ebdb1f3fd4dc Mon Sep 17 00:00:00 2001 From: xeji Date: Sun, 18 Feb 2018 23:19:41 +0100 Subject: [PATCH 1/6] virtmanager: 1.4.3 -> 1.5.0, cleanup dependencies remove unneeded dependencies, see issue #34043 --- .../virtualization/virt-manager/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 52737179108..7a2fb6d7f31 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python2Packages, intltool, file -, wrapGAppsHook, virtinst, gtkvnc, vte, avahi, dconf +, wrapGAppsHook, gtkvnc, vte, avahi, dconf , gobjectIntrospection, libvirt-glib, system-libvirt , gsettings_desktop_schemas, glib, libosinfo, gnome3 , spiceSupport ? true, spice_gtk ? null @@ -9,12 +9,12 @@ with stdenv.lib; python2Packages.buildPythonApplication rec { name = "virt-manager-${version}"; - version = "1.4.3"; + version = "1.5.0"; namePrefix = ""; src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; - sha256 = "093azs8p4p7y4nf5j25xpsvdxww7gky1g0hs8mkcvmpxl2wjd0jj"; + sha512 = "b375927776b9132fbd9dacd8223b6c94b89c32d6812394ec7e18df7c66f7e6dec853885e85e2b4b4ffd283e8afe0dd2526bafeac4b55511a4a115ef5798f97da"; }; nativeBuildInputs = [ @@ -23,15 +23,13 @@ python2Packages.buildPythonApplication rec { ]; buildInputs = - [ libvirt-glib vte virtinst dconf gtkvnc gnome3.defaultIconTheme avahi + [ libvirt-glib vte dconf gtkvnc gnome3.defaultIconTheme avahi gsettings_desktop_schemas libosinfo ] ++ optional spiceSupport spice_gtk; propagatedBuildInputs = with python2Packages; - [ eventlet greenlet gflags netaddr carrot routes PasteDeploy - m2crypto ipy twisted distutils_extra simplejson - cheetah lockfile httplib2 urlgrabber pyGtkGlade dbus-python - pygobject3 ipaddr mox libvirt libxml2 requests + [ + pygobject3 ipaddr libvirt libxml2 requests ]; patchPhase = '' From b0eb4d6390000eb60486f316afe13aa8dead4e8f Mon Sep 17 00:00:00 2001 From: xeji Date: Mon, 19 Feb 2018 01:02:47 +0100 Subject: [PATCH 2/6] virtmanager: 1.5.0: add gtk3 dependency otherwise virt-manager startup fails with Typelib file for namespace 'Pango', version '1.0' not found: Could not open display: :0 --- pkgs/applications/virtualization/virt-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 7a2fb6d7f31..9306a1dea9b 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, python2Packages, intltool, file , wrapGAppsHook, gtkvnc, vte, avahi, dconf , gobjectIntrospection, libvirt-glib, system-libvirt -, gsettings_desktop_schemas, glib, libosinfo, gnome3 +, gsettings_desktop_schemas, glib, libosinfo, gnome3, gtk3 , spiceSupport ? true, spice_gtk ? null }: @@ -24,7 +24,7 @@ python2Packages.buildPythonApplication rec { buildInputs = [ libvirt-glib vte dconf gtkvnc gnome3.defaultIconTheme avahi - gsettings_desktop_schemas libosinfo + gsettings_desktop_schemas libosinfo gtk3 ] ++ optional spiceSupport spice_gtk; propagatedBuildInputs = with python2Packages; From 7460dc318b9d7c05fb225ba565b865fad132bd20 Mon Sep 17 00:00:00 2001 From: xeji Date: Mon, 19 Feb 2018 01:15:47 +0100 Subject: [PATCH 3/6] virtmanager: 1.5.0: sha512->sha256 (readability) --- pkgs/applications/virtualization/virt-manager/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 9306a1dea9b..fb573bf6c9e 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec { src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; - sha512 = "b375927776b9132fbd9dacd8223b6c94b89c32d6812394ec7e18df7c66f7e6dec853885e85e2b4b4ffd283e8afe0dd2526bafeac4b55511a4a115ef5798f97da"; + sha256 = "d43a7b99d40acdcb8e9455e7874beee132cfcfce9eed0d6252e8f254a82cadc6"; }; nativeBuildInputs = [ From 77959471314fb2892ec48d2275e48f839d908d2f Mon Sep 17 00:00:00 2001 From: xeji Date: Tue, 20 Feb 2018 11:17:50 +0100 Subject: [PATCH 4/6] libvirt-glib: should build on Darwin platforms: linux -> unix to see if it builds on Darwin --- pkgs/development/libraries/libvirt-glib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 83b2983d9c4..ba4a96d4162 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -35,6 +35,6 @@ in stdenv.mkDerivation rec { ''; homepage = http://libvirt.org/; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } From bd83899f695b0f2f54482e0ee3f14303a9d7dfec Mon Sep 17 00:00:00 2001 From: xeji Date: Tue, 20 Feb 2018 12:38:19 +0100 Subject: [PATCH 5/6] Revert "libvirt-glib: should build on Darwin" ... but it doesn't (needs libcap-ng) This reverts commit 77959471314fb2892ec48d2275e48f839d908d2f. --- pkgs/development/libraries/libvirt-glib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index ba4a96d4162..83b2983d9c4 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -35,6 +35,6 @@ in stdenv.mkDerivation rec { ''; homepage = http://libvirt.org/; license = licenses.lgpl2Plus; - platforms = platforms.unix; + platforms = platforms.linux; }; } From 1cbccb95a7a0fee4bebdeb7b37ae2ecc51d3e685 Mon Sep 17 00:00:00 2001 From: xeji Date: Tue, 20 Feb 2018 12:47:34 +0100 Subject: [PATCH 6/6] virtmanager: set platforms to linux since dependency libvirt-glib currently doesn't build on Darwin --- pkgs/applications/virtualization/virt-manager/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index fb573bf6c9e..9e18a6738c3 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -61,6 +61,8 @@ python2Packages.buildPythonApplication rec { manages Xen and LXC (linux containers). ''; license = licenses.gpl2; + # exclude Darwin since libvirt-glib currently doesn't build there + platforms = platforms.linux; maintainers = with maintainers; [ qknight offline fpletz ]; }; }