ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6410 from nathanielbaxter/dev/virtmanager

Browse Source 
Update virtmanager and virtviewer
This commit is contained in:
lethalman 2015-02-26 10:02:48 +01:00
commit 02971cd5d3
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/virtualization/virt-manager/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl, python { stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl, python
, makeWrapper, virtinst, pyGtkGlade, pythonDBus, gnome_python, gtkvnc, vte , makeWrapper, virtinst, pyGtkGlade, pythonDBus, gnome_python, gtkvnc, vte
, gtk3, gobjectIntrospection, libvirt-glib, gsettings_desktop_schemas, glib , gtk3, gobjectIntrospection, libvirt-glib, gsettings_desktop_schemas, glib
, avahi, dconf, spiceSupport ? true, spice_gtk , avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo
}: }:
with stdenv.lib; with stdenv.lib;
@ -9,12 +9,12 @@ with pythonPackages;
buildPythonPackage rec { buildPythonPackage rec {
name = "virt-manager-${version}"; name = "virt-manager-${version}";
version = "1.0.1"; version = "1.1.0";
namePrefix = ""; namePrefix = "";
src = fetchurl { src = fetchurl {
url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz";
sha256 = "1n248kack1fni8y17ysgq5xhvffcgy4l62hnd0zvr4kjw0579qq8"; sha256 = "0hbr1wf4byfvbqlbq3w6s71ckhn626i4rb497y4z2cm12p5hc2db";
}; };
propagatedBuildInputs = propagatedBuildInputs =
@ -22,7 +22,7 @@ buildPythonPackage rec {
paste_deploy m2crypto ipy twisted sqlalchemy_migrate paste_deploy m2crypto ipy twisted sqlalchemy_migrate
distutils_extra simplejson readline glance cheetah lockfile httplib2 distutils_extra simplejson readline glance cheetah lockfile httplib2
urlgrabber virtinst pyGtkGlade pythonDBus gnome_python pygobject3 urlgrabber virtinst pyGtkGlade pythonDBus gnome_python pygobject3
libvirt libxml2Python ipaddr vte libvirt libxml2Python ipaddr vte libosinfo
] ++ optional spiceSupport spice_gtk; ] ++ optional spiceSupport spice_gtk;
buildInputs = buildInputs =

4
pkgs/applications/virtualization/virt-viewer/default.nix
View File

@ -11,10 +11,10 @@ with stdenv.lib;
let sourceInfo = rec { let sourceInfo = rec {
baseName="virt-viewer"; baseName="virt-viewer";
version="1.0"; version="2.0";
name="${baseName}-${version}"; name="${baseName}-${version}";
url="http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz"; url="http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz";
hash="09sf1xzvw2yysv4c1jkqlzrazdg501r4j12hiwjdzk5swk6lppw0"; hash="0dylhpk5rq9jz0l1cxs50q2s74z0wingygm1m33bmnmcnny87ig9";
}; in }; in
stdenv.mkDerivation { stdenv.mkDerivation {