Merge master into haskell-updates

6 files changed, 32 insertions, 24 deletions

diff --git a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix
index cf6395c8a53..7b9dc2de485 100644
--- a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix
+++ b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix
@@ -1,8 +1,8 @@
 { lib, stdenv, fetchgit }:
 
-stdenv.mkDerivation  {
-  name = "win-pvdrivers-git-20150701";
-  version = "20150701";
+stdenv.mkDerivation {
+  pname = "win-pvdrivers";
+  version = "unstable-2015-07-01";
 
   src = fetchgit {
     url = "https://github.com/ts468/win-pvdrivers";
@@ -12,13 +12,13 @@ stdenv.mkDerivation  {
 
   buildPhase =
     let unpack = x: "tar xf $src/${x}.tar; mkdir -p x86/${x} amd64/${x}; cp ${x}/x86/* x86/${x}/.; cp ${x}/x64/* amd64/${x}/.";
-    in lib.concatStringsSep "\n" (map unpack ["xenbus" "xeniface" "xenvif" "xennet" "xenvbd"]);
+    in lib.concatStringsSep "\n" (map unpack [ "xenbus" "xeniface" "xenvif" "xennet" "xenvbd" ]);
 
   installPhase = ''
     mkdir -p $out
     cp -r x86 $out/.
     cp -r amd64 $out/.
-    '';
+  '';
 
   meta = with lib; {
     description = "Xen Subproject: Windows PV Driver";
diff --git a/pkgs/applications/virtualization/driver/win-qemu/default.nix b/pkgs/applications/virtualization/driver/win-qemu/default.nix
index 7c1eb0055a3..a4cd8dacc44 100644
--- a/pkgs/applications/virtualization/driver/win-qemu/default.nix
+++ b/pkgs/applications/virtualization/driver/win-qemu/default.nix
@@ -1,19 +1,19 @@
 { lib, stdenv, fetchurl, p7zip }:
 
-stdenv.mkDerivation  {
-  name = "win-qemu-0.1.105-1";
+stdenv.mkDerivation rec {
+  pname = "win-qemu";
   version = "0.1.105-1";
 
   dontUnpack = true;
 
   src = fetchurl {
-    url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.105-1/virtio-win.iso";
+    url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso";
     sha256 = "065gz7s77y0q9kfqbr27451sr28rm9azpi88sqjkfph8c6r8q3wc";
   };
 
   buildPhase = ''
     ${p7zip}/bin/7z x $src
-    '';
+  '';
 
   installPhase =
     let
@@ -23,10 +23,10 @@ stdenv.mkDerivation  {
         mkdir -p $out/${arch}/qemuagent
         cp guest-agent/${if arch=="x86" then "qemu-ga-x86.msi" else "qemu-ga-x64.msi"} $out/${arch}/qemuagent/qemu-guest-agent.msi
         (cd $out/${arch}/qemuagent; ${p7zip}/bin/7z x qemu-guest-agent.msi; rm qemu-guest-agent.msi)
-        '';
+      '';
       copy = arch: version: (copy_pvpanic arch version) + (copy_pciserial arch) + (copy_agent arch);
     in
-      (copy "amd64" "w8.1") + (copy "x86" "w8.1");
+    (copy "amd64" "w8.1") + (copy "x86" "w8.1");
 
   meta = with lib; {
     description = "Windows QEMU Drivers";
diff --git a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix
index e9ad3b86338..ef8ec062e4d 100644
--- a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix
+++ b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix
@@ -12,8 +12,8 @@ let
   };
 in
 
-stdenv.mkDerivation  {
-  name = "gplpv-0.11.0.373";
+stdenv.mkDerivation {
+  pname = "gplpv";
   version = "0.11.0.373";
 
   dontUnpack = true;
@@ -23,13 +23,13 @@ stdenv.mkDerivation  {
     (cd x86; ${p7zip}/bin/7z e ${src_x86})
     mkdir -p amd64
     (cd amd64; ${p7zip}/bin/7z e ${src_amd64})
-    '';
+  '';
 
   installPhase = ''
     mkdir -p $out/x86 $out/amd64
     cp x86/* $out/x86/.
     cp amd64/* $out/amd64/.
-    '';
+  '';
 
   meta = with lib; {
     description = ''
@@ -37,7 +37,7 @@ stdenv.mkDerivation  {
       Windows to be para-virtualized.
       The drivers are signed by Univention with a Software Publishers
       Certificate obtained from the VeriSign CA.
-      '';
+    '';
     homepage = "http://wiki.univention.de/index.php?title=Installing-signed-GPLPV-drivers";
     maintainers = [ maintainers.tstrobel ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix
index 9b6c412fa21..cb45f5b7a82 100644
--- a/pkgs/applications/virtualization/lima/default.nix
+++ b/pkgs/applications/virtualization/lima/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "lima";
-  version = "0.7.2";
+  version = "0.7.3";
 
   src = fetchFromGitHub {
     owner = "lima-vm";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-XJZg3uX++gU65bO1uqJblXXcVPzFXROCWFTn/gfkea0=";
+    sha256 = "sha256-HVWZ0XF1oBUHhkOQHELlZ/pxXUsUo2cVo6EhZl6S0W4=";
   };
 
-  vendorSha256 = "sha256-+fx/Iy78gmhxRjXPkHYdixpaMkOwEANUsZA+KSdQkWU=";
+  vendorSha256 = "sha256-LhmZRa7vDylA4DRTfKFRs3lQMnwNfzF1H6ki1/zdpUg=";
 
   nativeBuildInputs = [ makeWrapper installShellFiles ];
 
diff --git a/pkgs/applications/virtualization/qboot/default.nix b/pkgs/applications/virtualization/qboot/default.nix
index 8ac00d1f8e1..c7a3620d644 100644
--- a/pkgs/applications/virtualization/qboot/default.nix
+++ b/pkgs/applications/virtualization/qboot/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, meson, ninja, fetchFromGitHub, nixosTests }:
 
 stdenv.mkDerivation {
-  name = "qboot-20200423";
+  pname = "qboot";
+  version = "unstable-2020-04-23";
 
   src = fetchFromGitHub {
     owner = "bonzini";
@@ -26,6 +27,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/bonzini/qboot";
     license = lib.licenses.gpl2;
     maintainers = with lib.maintainers; [ tstrobel ];
-    platforms = ["x86_64-linux" "i686-linux"];
+    platforms = [ "x86_64-linux" "i686-linux" ];
   };
 }
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 98c7f80df8a..0dcebb71cc5 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -2,7 +2,7 @@
 , libX11, xorgproto, libXext, libXcursor, libXmu, libIDL, SDL, libcap, libGL
 , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras
 , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43
-, alsa-lib, curl, libvpx, nettools, dbus, substituteAll
+, alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib
 # If open-watcom-bin is not passed, VirtualBox will fall back to use
 # the shipped alternative sources (assembly).
 , open-watcom-bin ? null
@@ -14,6 +14,7 @@
 , enableHardening ? false
 , headless ? false
 , enable32bitGuests ? true
+, enableWebService ? false
 }:
 
 with lib;
@@ -49,7 +50,8 @@ in stdenv.mkDerivation {
     ++ optional pythonBindings python # Python is needed even when not building bindings
     ++ optional pulseSupport libpulseaudio
     ++ optionals (headless) [ libXrandr libGL ]
-    ++ optionals (!headless) [ qtbase qtx11extras libXinerama SDL ];
+    ++ optionals (!headless) [ qtbase qtx11extras libXinerama SDL ]
+    ++ optionals (enableWebService) [ gsoap zlib ];
 
   hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ];
 
@@ -133,6 +135,10 @@ in stdenv.mkDerivation {
     PATH_QT5_X11_EXTRAS_INC        := ${getDev qtx11extras}/include
     TOOL_QT5_LRC                   := ${getDev qttools}/bin/lrelease
     ''}
+    ${optionalString (enableWebService) ''
+    # fix gsoap missing zlib include and produce errors with --as-needed
+    VBOX_GSOAP_CXX_LIBS := gsoapssl++ z
+    ''}
     LOCAL_CONFIG
 
     ./configure \
@@ -142,6 +148,7 @@ in stdenv.mkDerivation {
       ${optionalString (!pulseSupport) "--disable-pulse"} \
       ${optionalString (!enableHardening) "--disable-hardening"} \
       ${optionalString (!enable32bitGuests) "--disable-vmmraw"} \
+      ${optionalString (enableWebService) "--enable-webservice"} \
       ${optionalString (open-watcom-bin != null) "--with-ow-dir=${open-watcom-bin}"} \
       --disable-kmods
     sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib.dev}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \
@@ -168,7 +175,7 @@ in stdenv.mkDerivation {
       -name src -o -exec cp -avt "$libexec" {} +
 
     mkdir -p $out/bin
-    for file in ${optionalString (!headless) "VirtualBox VBoxSDL rdesktop-vrdp"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do
+    for file in ${optionalString (!headless) "VirtualBox VBoxSDL rdesktop-vrdp"} ${optionalString (enableWebService) "vboxwebsrv"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do
         echo "Linking $file to /bin"
         test -x "$libexec/$file"
         ln -s "$libexec/$file" $out/bin/$file