From 02d1702a7d33ac2672067c404d7b96eac1cf59ba Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sat, 11 Dec 2021 11:47:16 -0500 Subject: maintainers: Add amarshall --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9101690bd0f3c..95e9585546f9d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -601,6 +601,12 @@ githubId = 15623522; name = "Amar Paul"; }; + amarshall = { + email = "andrew@johnandrewmarshall.com"; + github = "amarshall"; + githubId = 153175; + name = "Andrew Marshall"; + }; ambroisie = { email = "bruno.nixpkgs@belanyi.fr"; github = "ambroisie"; -- cgit 1.4.1 From 0deb79e47b96975e51e303edf04f8bae2308fb7f Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 14 Feb 2022 18:37:24 -0500 Subject: libgovirt: init at 0.3.8 --- .../virtualization/libgovirt/default.nix | 39 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/virtualization/libgovirt/default.nix diff --git a/pkgs/applications/virtualization/libgovirt/default.nix b/pkgs/applications/virtualization/libgovirt/default.nix new file mode 100644 index 0000000000000..bd92f7666abf9 --- /dev/null +++ b/pkgs/applications/virtualization/libgovirt/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchurl +, glib +, librest +, libsoup +, pkg-config +}: + +with lib; + +stdenv.mkDerivation rec { + pname = "libgovirt"; + version = "0.3.8"; + + src = fetchurl { + url = "https://download.gnome.org/sources/libgovirt/0.3/${pname}-${version}.tar.xz"; + sha256 = "sha256-HckYYikXa9+p8l/Y+oLAoFi2pgwcyAfHUH7IqTwPHfg="; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + pkg-config + ]; + + propagatedBuildInputs = [ + librest + libsoup + ]; + + meta = { + homepage = "https://gitlab.gnome.org/GNOME/libgovirt"; + description = "GObject wrapper for the oVirt REST API"; + maintainers = [ maintainers.amarshall ]; + platforms = platforms.linux; + license = licenses.lgpl21; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ccfe828dbc829..0ea5339ebc2e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7052,6 +7052,8 @@ with pkgs; libcsptr = callPackage ../development/libraries/libcsptr { }; + libgovirt = callPackage ../applications/virtualization/libgovirt { }; + libscrypt = callPackage ../development/libraries/libscrypt { }; libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; -- cgit 1.4.1 From c027cb0041ddbc73cc3e9894b97073c1cd6a9483 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 14 Feb 2022 18:42:22 -0500 Subject: virt-viewer: Formatting In preparation for updating the version where a lot of deps will have to change, so that the *next* diff is small and understandable. --- .../virtualization/virt-viewer/default.nix | 53 ++++++++++++++++++---- 1 file changed, 45 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 4fd56e0cae335..a7f9c4c376397 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,11 +1,31 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, shared-mime-info, wrapGAppsHook -, glib, gsettings-desktop-schemas, gtk-vnc, gtk3, libvirt, libvirt-glib, libxml2, vte +{ lib +, stdenv +, fetchurl +, gdbm ? null +, glib +, gsettings-desktop-schemas +, gtk-vnc +, gtk3 +, intltool +, libcap ? null +, libvirt +, libvirt-glib +, libxml2 +, pkg-config +, shared-mime-info +, spice-gtk ? null +, spice-protocol ? null , spiceSupport ? true -, spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null +, vte +, wrapGAppsHook }: -assert spiceSupport -> - spice-gtk != null && spice-protocol != null && libcap != null && gdbm != null; +assert spiceSupport -> ( + gdbm != null + && libcap != null + && spice-gtk != null + && spice-protocol != null +); with lib; @@ -19,11 +39,28 @@ stdenv.mkDerivation rec { sha256 = "09a83mzyn3b4nd7wpa659g1zf1fjbzb79rk968bz6k5xl21k7d4i"; }; - nativeBuildInputs = [ pkg-config intltool shared-mime-info wrapGAppsHook glib ]; + nativeBuildInputs = [ + glib + intltool + pkg-config + shared-mime-info + wrapGAppsHook + ]; + buildInputs = [ - glib gsettings-desktop-schemas gtk-vnc gtk3 libvirt libvirt-glib libxml2 vte + glib + gsettings-desktop-schemas + gtk-vnc + gtk3 + libvirt + libvirt-glib + libxml2 + vte ] ++ optionals spiceSupport [ - spice-gtk spice-protocol libcap gdbm + gdbm + libcap + spice-gtk + spice-protocol ]; # Required for USB redirection PolicyKit rules file -- cgit 1.4.1 From a6b058e0fac70144041029ba3e2de7e44efcecba Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 14 Feb 2022 19:08:11 -0500 Subject: virt-viewer: 9.0 -> 11.0 --- .../virtualization/virt-viewer/default.nix | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index a7f9c4c376397..29e05a069ce7f 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, bash-completion , fetchurl , gdbm ? null , glib @@ -8,10 +9,14 @@ , gtk3 , intltool , libcap ? null +, libgovirt , libvirt , libvirt-glib , libxml2 +, meson +, ninja , pkg-config +, python3 , shared-mime-info , spice-gtk ? null , spice-protocol ? null @@ -31,27 +36,32 @@ with lib; stdenv.mkDerivation rec { baseName = "virt-viewer"; - version = "9.0"; + version = "11.0"; name = "${baseName}-${version}"; src = fetchurl { - url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz"; - sha256 = "09a83mzyn3b4nd7wpa659g1zf1fjbzb79rk968bz6k5xl21k7d4i"; + url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.xz"; + sha256 = "sha256-pD+iMlxMHHelyMmAZaww7wURohrJjlkPIjQIabrZq9A="; }; nativeBuildInputs = [ glib intltool + meson + ninja pkg-config + python3 shared-mime-info wrapGAppsHook ]; buildInputs = [ + bash-completion glib gsettings-desktop-schemas gtk-vnc gtk3 + libgovirt libvirt libvirt-glib libxml2 @@ -67,7 +77,10 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = optional spiceSupport spice-gtk; strictDeps = true; - enableParallelBuilding = true; + + postPatch = '' + patchShebangs build-aux/post_install.py + ''; meta = { description = "A viewer for remote virtual machines"; -- cgit 1.4.1