diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/virtualization')
8 files changed, 59 insertions, 30 deletions
diff --git a/nixpkgs/pkgs/applications/virtualization/conmon/default.nix b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix index eb143412bd40..0b523d7b88d7 100644 --- a/nixpkgs/pkgs/applications/virtualization/conmon/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/conmon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { project = "conmon"; name = "${project}-${version}"; - version = "0.3.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "containers"; repo = project; rev = "v${version}"; - sha256 = "0s23gm0cq4mylv882dr1n8bqql42674vny3z58yy77lwzmifc6id"; + sha256 = "1sigcylya668f5jzkf1vgfsgqy26l3glh9a3g8lhd2468ax6wymk"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/nixpkgs/pkgs/applications/virtualization/docker/default.nix index 384ab8f30473..a1125f25e816 100644 --- a/nixpkgs/pkgs/applications/virtualization/docker/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/docker/default.nix @@ -201,9 +201,21 @@ rec { # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/* docker_18_09 = makeOverridable dockerGen { - version = "18.09.7"; - rev = "2d0083d657f82c47044c8d3948ba434b622fe2fd"; - sha256 = "1f7q99pay7mmy925ap95p935y9xslxpmgha397db7x2w008rfl9k"; + version = "18.09.8"; + rev = "0dd43dd87fd530113bf44c9bba9ad8b20ce4637f"; + sha256 = "07ljxdqylbfbq1939hqyaav966ga7ds5b38dn7af1h0aks86y2s3"; + runcRev = "425e105d5a03fabd737a126ad93d62a9eeede87f"; + runcSha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf"; + containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb"; + containerdSha256 = "0sp5mn5wd3xma4svm6hf67hyhiixzkzz6ijhyjkwdrc4alk81357"; + tiniRev = "fec3683b971d9c3ef73f284f176672c44b448662"; + tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; + }; + + docker_19_03 = makeOverridable dockerGen { + version = "19.03.1"; + rev = "74b1e89e8ac68948be88fe0aa1e2767ae28659fe"; + sha256 = "1m7bq7la29d8piwiq5whzcyrm7g3lv497wnri0lh6gxi10nwv06h"; runcRev = "425e105d5a03fabd737a126ad93d62a9eeede87f"; runcSha256 = "05s4p12mgmdcy7gjralh41wlgds6m69zdgwbpdn1xjj2487dmhxf"; containerdRev = "894b81a4b802e4eb2a91d1ce216b8817763c29fb"; diff --git a/nixpkgs/pkgs/applications/virtualization/dynamips/default.nix b/nixpkgs/pkgs/applications/virtualization/dynamips/default.nix index 9419939d1c74..cce5a674f7cd 100644 --- a/nixpkgs/pkgs/applications/virtualization/dynamips/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/dynamips/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "dynamips"; - version = "0.2.20"; + version = "0.2.21"; src = fetchFromGitHub { owner = "GNS3"; repo = pname; rev = "v${version}"; - sha256 = "1841h0m0k0p3c3ify4imafjk7jigcj2zlr8rn3iyp7jnafkxqik7"; + sha256 = "0pvdqs6kjz0x0wqb5f1k3r25dg82wssm7wz4psm0m6bxsvf5l0i5"; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/nixpkgs/pkgs/applications/virtualization/podman/default.nix index b07365a5ca11..8d264f3062cd 100644 --- a/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { name = "podman-${version}"; - version = "1.3.2"; + version = "1.4.4"; src = fetchFromGitHub { owner = "containers"; repo = "libpod"; rev = "v${version}"; - sha256 = "1j5n08273igj6wm9rrwks9nnklv91060bn1yv3ak78csxc05whs3"; + sha256 = "13qgrvqawrrz4apdcds4amkljyjzx056545962wk8p0d291hqv5a"; }; goPackagePath = "github.com/containers/libpod"; @@ -39,7 +39,7 @@ buildGoPackage rec { homepage = https://podman.io/; description = "A program for managing pods, containers and container images"; license = licenses.asl20; - maintainers = with maintainers; [ vdemeester ]; + maintainers = with maintainers; [ vdemeester saschagrunert ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix b/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix index 392517e3ab26..b6a6ebde5409 100644 --- a/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,31 +1,37 @@ { stdenv, fetchurl, python3Packages, intltool, file , wrapGAppsHook, gtk-vnc, vte, avahi, dconf , gobject-introspection, libvirt-glib, system-libvirt -, gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3 +, gsettings-desktop-schemas, glib, libosinfo, gnome3 +, gtksourceview4 , spiceSupport ? true, spice-gtk ? null , cpio, e2fsprogs, findutils, gzip }: with stdenv.lib; +# TODO: remove after there's support for setupPyDistFlags +let + setuppy = ../../../development/interpreters/python/run_setup.py; +in python3Packages.buildPythonApplication rec { name = "virt-manager-${version}"; - version = "2.2.0"; + version = "2.2.1"; namePrefix = ""; src = fetchurl { url = "http://virt-manager.org/download/sources/virt-manager/${name}.tar.gz"; - sha256 = "0186c2fjqm3wdr3wik4fcyl5l3gv5j6sxn18d0vclw83w4yrhjz9"; + sha256 = "06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g"; }; nativeBuildInputs = [ - wrapGAppsHook intltool file + intltool file gobject-introspection # for setup hook populating GI_TYPELIB_PATH ]; buildInputs = [ + wrapGAppsHook libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi - gsettings-desktop-schemas libosinfo gtk3 + gsettings-desktop-schemas libosinfo gtksourceview4 gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 ] ++ optional spiceSupport spice-gtk; @@ -43,8 +49,12 @@ python3Packages.buildPythonApplication rec { ${python3Packages.python.interpreter} setup.py configure --prefix=$out ''; - postInstall = '' - ${glib.dev}/bin/glib-compile-schemas "$out"/share/glib-2.0/schemas + # TODO: remove after there's support for setupPyDistFlags + buildPhase = '' + runHook preBuild + cp ${setuppy} nix_run_setup + ${python3Packages.python.pythonForBuild.interpreter} nix_run_setup --no-update-icon-cache build_ext bdist_wheel + runHook postBuild ''; preFixup = '' diff --git a/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix b/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix index 7c90f9b3483f..9c307d8e9ba4 100644 --- a/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { xen ] ++ optionals spiceSupport [ spice-gtk spice-protocol libcap gdbm - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; # Required for USB redirection PolicyKit rules file diff --git a/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix b/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix index b36d918a803f..1a6ba5ac5273 100644 --- a/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,7 +1,7 @@ -{ config, stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2 -, libX11, xorgproto, libXext, libXcursor, libXmu, qt5, libIDL, SDL, libcap, libGL -, libpng, glib, lvm2, libXrandr, libXinerama, libopus -, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 +{ config, stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, wrapQtAppsHook +, libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL +, libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras +, qttools, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 , alsaLib, curl, libvpx, nettools, dbus , makeself, perl , javaBindings ? true, jdk ? null # Almost doesn't affect closure size @@ -33,7 +33,11 @@ in stdenv.mkDerivation { outputs = [ "out" "modsrc" ]; - nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 patchelfUnstable ]; + nativeBuildInputs = [ pkgconfig which docbook_xsl docbook_xml_dtd_43 patchelfUnstable ] + ++ optional (!headless) wrapQtAppsHook; + + # Wrap manually because we just need to wrap one executable + dontWrapQtApps = true; buildInputs = [ iasl dev86 libxslt libxml2 xorgproto libX11 libXext libXcursor libIDL @@ -43,7 +47,7 @@ in stdenv.mkDerivation { ++ optional pythonBindings python # Python is needed even when not building bindings ++ optional pulseSupport libpulseaudio ++ optionals (headless) [ libXrandr libGL ] - ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ]; + ++ optionals (!headless) [ qtbase qtx11extras libXinerama SDL ]; hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ]; @@ -53,7 +57,7 @@ in stdenv.mkDerivation { -e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \ -e 's@CXX_FLAGS="\(.*\)"@CXX_FLAGS="-std=c++11 \1"@' \ ${optionalString (!headless) '' - -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qt5.qtbase}/bin"@' \ + -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qtbase}/bin"@' \ ''} -i configure ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 @@ -105,9 +109,9 @@ in stdenv.mkDerivation { VBOX_JAVA_HOME := ${jdk} ''} ${optionalString (!headless) '' - PATH_QT5_X11_EXTRAS_LIB := ${getLib qt5.qtx11extras}/lib - PATH_QT5_X11_EXTRAS_INC := ${getDev qt5.qtx11extras}/include - TOOL_QT5_LRC := ${getDev qt5.qttools}/bin/lrelease + PATH_QT5_X11_EXTRAS_LIB := ${getLib qtx11extras}/lib + PATH_QT5_X11_EXTRAS_INC := ${getDev qtx11extras}/include + TOOL_QT5_LRC := ${getDev qttools}/bin/lrelease ''} LOCAL_CONFIG @@ -177,6 +181,10 @@ in stdenv.mkDerivation { cp -rv out/linux.*/${buildType}/bin/src "$modsrc" ''; + preFixup = optionalString (!headless) '' + wrapQtApp $out/bin/VirtualBox + ''; + passthru = { inherit version; # for guest additions inherit extensionPack; # for inclusion in profile to prevent gc diff --git a/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix b/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix index 94682893d51c..59d642108374 100644 --- a/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix +++ b/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg }: stdenv.mkDerivation rec { name = "x11docker-${version}"; - version = "5.4.4"; + version = "6.0.0"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "1p45dyd1zfjxlawsy190q71hwl083f90ryaslslhxsadsi9m64dq"; + sha256 = "1sfdxlh50hv8j3dj5bphihqdyf8s7ixm6ckrmvqgr2y3gak1y840"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ nx-libs xorg.xhost xorg.xinit ]; |