Merge commit '4e60699fa727e4a0f9a3e78948012f86da32cfef'

30 files changed, 43 insertions, 48 deletions

diff --git a/nixpkgs/pkgs/applications/virtualization/8086tiny/default.nix b/nixpkgs/pkgs/applications/virtualization/8086tiny/default.nix
index 15d98dc9be50..6e61ef098f35 100644
--- a/nixpkgs/pkgs/applications/virtualization/8086tiny/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/8086tiny/default.nix
@@ -6,7 +6,7 @@ assert sdlSupport -> (SDL != null);
 
 stdenv.mkDerivation rec {
 
-  name = "8086tiny-${version}";
+  pname = "8086tiny";
   version = "1.25";
 
   src = fetchurl {
diff --git a/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix b/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix
index e7cd5b7bde68..02fb256b38ce 100644
--- a/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/aqemu/default.nix
@@ -2,7 +2,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "aqemu-${version}";
+  pname = "aqemu";
   version = "0.9.2";
 
   src = fetchFromGitHub {
diff --git a/nixpkgs/pkgs/applications/virtualization/bochs/default.nix b/nixpkgs/pkgs/applications/virtualization/bochs/default.nix
index f9d7128330fb..72db4f1e5aa5 100644
--- a/nixpkgs/pkgs/applications/virtualization/bochs/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/bochs/default.nix
@@ -18,11 +18,11 @@ assert curlSupport -> (curl != null);
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "bochs-${version}";
+  pname = "bochs";
   version = "2.6.9";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/bochs/bochs/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/bochs/bochs/${version}/${pname}-${version}.tar.gz";
     sha256 = "1379cq4cnfprhw8mgh60i0q9j8fz8d7n3d5fnn2g9fdiv5znfnzf";
   };
 
diff --git a/nixpkgs/pkgs/applications/virtualization/cbfstool/default.nix b/nixpkgs/pkgs/applications/virtualization/cbfstool/default.nix
index 13060a50290b..9cdaec1c698a 100644
--- a/nixpkgs/pkgs/applications/virtualization/cbfstool/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/cbfstool/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, iasl, flex, bison }:
 
 stdenv.mkDerivation rec {
-  name = "cbfstool-${version}";
+  pname = "cbfstool";
   version = "4.9";
 
   src = fetchurl {
diff --git a/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/nixpkgs/pkgs/applications/virtualization/containerd/default.nix
index d21bc8cc32b5..b770c6ed0a59 100644
--- a/nixpkgs/pkgs/applications/virtualization/containerd/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/containerd/default.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildGoPackage rec {
-  name = "containerd-${version}";
+  pname = "containerd";
   version = "1.2.6";
 
   src = fetchFromGitHub {
diff --git a/nixpkgs/pkgs/applications/virtualization/docker/distribution.nix b/nixpkgs/pkgs/applications/virtualization/docker/distribution.nix
index 0af9abc852ef..ed4db853c389 100644
--- a/nixpkgs/pkgs/applications/virtualization/docker/distribution.nix
+++ b/nixpkgs/pkgs/applications/virtualization/docker/distribution.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "distribution-${version}";
+  pname = "distribution";
   version = "2.6.2";
   rev = "v${version}";
 
diff --git a/nixpkgs/pkgs/applications/virtualization/driver/win-virtio/default.nix b/nixpkgs/pkgs/applications/virtualization/driver/win-virtio/default.nix
index 946014e5cc9a..351353ceb96e 100644
--- a/nixpkgs/pkgs/applications/virtualization/driver/win-virtio/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/driver/win-virtio/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, p7zip }:
 stdenv.mkDerivation rec {
-  name = "win-virtio-${version}";
+  pname = "win-virtio";
   version = "0.1.141-1";
 
   phases = [ "buildPhase" "installPhase" ];
diff --git a/nixpkgs/pkgs/applications/virtualization/dynamips/default.nix b/nixpkgs/pkgs/applications/virtualization/dynamips/default.nix
index cce5a674f7cd..6f35257b50fd 100644
--- a/nixpkgs/pkgs/applications/virtualization/dynamips/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/dynamips/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, libelf, libpcap }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "dynamips";
   version = "0.2.21";
 
diff --git a/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix b/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix
index ab971fe64c98..691c74301e39 100644
--- a/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/ecs-agent/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name    = "${pname}-${version}";
   pname   = "amazon-ecs-agent";
   version = "1.18.0";
 
diff --git a/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix b/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix
index 58f4dd48cc8b..0f53a5c4f14d 100644
--- a/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "looking-glass-client-${version}";
+  pname = "looking-glass-client";
   version = "B1";
 
   src = fetchFromGitHub {
diff --git a/nixpkgs/pkgs/applications/virtualization/nvidia-docker/default.nix b/nixpkgs/pkgs/applications/virtualization/nvidia-docker/default.nix
index 197b3045cf27..b58a5108ebad 100644
--- a/nixpkgs/pkgs/applications/virtualization/nvidia-docker/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/nvidia-docker/default.nix
@@ -25,7 +25,7 @@ with lib; let
   };
 
   nvidia-container-runtime-hook = buildGoPackage rec {
-    name = "nvidia-container-runtime-hook-${version}";
+    pname = "nvidia-container-runtime-hook";
     version = "1.4.0";
 
     goPackagePath = "nvidia-container-runtime-hook";
@@ -46,7 +46,7 @@ with lib; let
   });
 
 in stdenv.mkDerivation rec {
-  name = "nvidia-docker-${version}";
+  pname = "nvidia-docker";
   version = "2.0.3";
 
   src = fetchFromGitHub {
diff --git a/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc.nix b/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
index 46b8e3ba43c3..71c02ab4de50 100644
--- a/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
+++ b/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc.nix
@@ -12,7 +12,7 @@ with lib; let
   };
 
 in stdenv.mkDerivation rec {
-  name = "libnvidia-container-${version}";
+  pname = "libnvidia-container";
   version = "1.0.0";
 
   src = fetchFromGitHub {
diff --git a/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix b/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix
index 200542f4de84..ee241abda7f8 100644
--- a/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -5,7 +5,7 @@
   withX ? true }:
 
 stdenv.mkDerivation rec {
-  name = "open-vm-tools-${version}";
+  pname = "open-vm-tools";
   version = "10.3.10";
 
   src = fetchFromGitHub {
diff --git a/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/nixpkgs/pkgs/applications/virtualization/podman/default.nix
index f7ea6df8493b..ff768cb7878c 100644
--- a/nixpkgs/pkgs/applications/virtualization/podman/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/podman/default.nix
@@ -4,7 +4,7 @@
 }:
 
 buildGoPackage rec {
-  name = "podman-${version}";
+  pname = "podman";
   version = "1.5.1";
 
   src = fetchFromGitHub {
diff --git a/nixpkgs/pkgs/applications/virtualization/remotebox/default.nix b/nixpkgs/pkgs/applications/virtualization/remotebox/default.nix
index 8777f7cc2db2..d8a2878e3f79 100644
--- a/nixpkgs/pkgs/applications/virtualization/remotebox/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/remotebox/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, perl, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "remotebox-${version}";
+  pname = "remotebox";
   version = "2.6";
 
   src = fetchurl {
diff --git a/nixpkgs/pkgs/applications/virtualization/rkt/default.nix b/nixpkgs/pkgs/applications/virtualization/rkt/default.nix
index 0f53ede188ce..fd0bd92faa60 100644
--- a/nixpkgs/pkgs/applications/virtualization/rkt/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/rkt/default.nix
@@ -13,8 +13,8 @@ let
 
 in stdenv.mkDerivation rec {
   version = "1.30.0";
-  name = "rkt-${version}";
-  BUILDDIR="build-${name}";
+  pname = "rkt";
+  BUILDDIR="build-${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "coreos";
diff --git a/nixpkgs/pkgs/applications/virtualization/runc/default.nix b/nixpkgs/pkgs/applications/virtualization/runc/default.nix
index 10c7d17209c3..6357f9fadff9 100644
--- a/nixpkgs/pkgs/applications/virtualization/runc/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/runc/default.nix
@@ -4,7 +4,7 @@
 with lib;
 
 buildGoPackage rec {
-  name = "runc-${version}";
+  pname = "runc";
   version = "1.0.0-rc8";
 
   src = fetchFromGitHub {
diff --git a/nixpkgs/pkgs/applications/virtualization/seabios/default.nix b/nixpkgs/pkgs/applications/virtualization/seabios/default.nix
index 5aa73528e9d7..32528627a3c8 100644
--- a/nixpkgs/pkgs/applications/virtualization/seabios/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/seabios/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "seabios-${version}";
+  pname = "seabios";
   version = "1.11.0";
 
   src = fetchurl {
-    url = "http://code.coreboot.org/p/seabios/downloads/get/${name}.tar.gz";
+    url = "http://code.coreboot.org/p/seabios/downloads/get/${pname}-${version}.tar.gz";
     sha256 = "1xwvp77djxbxbxg82hzj26pv6zka3556vkdcp09hnfwapcp46av2";
   };
 
diff --git a/nixpkgs/pkgs/applications/virtualization/singularity/default.nix b/nixpkgs/pkgs/applications/virtualization/singularity/default.nix
index e146086b5549..60825063cabc 100644
--- a/nixpkgs/pkgs/applications/virtualization/singularity/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/singularity/default.nix
@@ -14,7 +14,7 @@
 with lib;
 
 buildGoPackage rec {
-  name = "singularity-${version}";
+  pname = "singularity";
   version = "3.2.1";
 
   src = fetchFromGitHub {
diff --git a/nixpkgs/pkgs/applications/virtualization/tini/default.nix b/nixpkgs/pkgs/applications/virtualization/tini/default.nix
index 25c19cd79c7f..39508412333c 100644
--- a/nixpkgs/pkgs/applications/virtualization/tini/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/tini/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "0.18.0";
-  name = "tini-${version}";
+  pname = "tini";
 
   src = fetchFromGitHub {
     owner = "krallin";
diff --git a/nixpkgs/pkgs/applications/virtualization/tinyemu/default.nix b/nixpkgs/pkgs/applications/virtualization/tinyemu/default.nix
index a8f113307251..224f77ed32d4 100644
--- a/nixpkgs/pkgs/applications/virtualization/tinyemu/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/tinyemu/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, openssl, curl, SDL }:
 
 stdenv.mkDerivation rec {
-  name = "tinyemu-${version}";
+  pname = "tinyemu";
   version = "2018-09-23";
   src = fetchurl {
-    url = "https://bellard.org/tinyemu/${name}.tar.gz";
+    url = "https://bellard.org/tinyemu/${pname}-${version}.tar.gz";
     sha256 = "0d6payyqf4lpvmmzvlpq1i8wpbg4sf3h6llsw0xnqdgq3m9dan4v";
   };
   buildInputs = [ openssl curl SDL ];
diff --git a/nixpkgs/pkgs/applications/virtualization/virt-manager/qt.nix b/nixpkgs/pkgs/applications/virtualization/virt-manager/qt.nix
index c1dbad94250a..5a98e71c9166 100644
--- a/nixpkgs/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/nixpkgs/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -5,7 +5,7 @@
 }:
 
 mkDerivation rec {
-  name = "virt-manager-qt-${version}";
+  pname = "virt-manager-qt";
   version = "0.70.91";
 
   src = fetchFromGitHub {
diff --git a/nixpkgs/pkgs/applications/virtualization/virt-top/default.nix b/nixpkgs/pkgs/applications/virtualization/virt-top/default.nix
index 493307d0d078..382ebba3c57e 100644
--- a/nixpkgs/pkgs/applications/virtualization/virt-top/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/virt-top/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, ocamlPackages, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "virt-top-${version}";
+  pname = "virt-top";
   version = "2017-11-18-unstable";
 
   src = fetchgit {
diff --git a/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix b/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix
index eb5d53c2b89f..3d0589032009 100644
--- a/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -1,10 +1,7 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtk-vnc, gmp
-, libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl
-, gsettings-desktop-schemas, wrapGAppsHook, libvirt-glib, libcap_ng, numactl
-, libapparmor, gst_all_1
+{ stdenv, fetchurl, pkgconfig, intltool, shared-mime-info, wrapGAppsHook
+, glib, gsettings-desktop-schemas, gtk-vnc, gtk3, libvirt, libvirt-glib, libxml2, vte
 , spiceSupport ? true
 , spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null
-, xenSupport ? false, xen ? null
 }:
 
 assert spiceSupport ->
@@ -22,13 +19,9 @@ stdenv.mkDerivation rec {
     sha256 = "1vdnjmhrva7r1n9nv09j8gc12hy0j9j5l4rka4hh0jbsbpnmiwyw";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];
+  nativeBuildInputs = [ pkgconfig intltool shared-mime-info wrapGAppsHook glib ];
   buildInputs = [
-    glib libxml2 gtk3 gtk-vnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info
-    libvirt yajl gsettings-desktop-schemas libvirt-glib
-    libcap_ng numactl libapparmor
-  ] ++ optionals xenSupport [
-    xen
+    glib gsettings-desktop-schemas gtk-vnc gtk3 libvirt libvirt-glib libxml2 vte
   ] ++ optionals spiceSupport [
     spice-gtk spice-protocol libcap gdbm
   ];
@@ -36,6 +29,9 @@ stdenv.mkDerivation rec {
   # Required for USB redirection PolicyKit rules file
   propagatedUserEnvPkgs = optional spiceSupport spice-gtk;
 
+  strictDeps = true;
+  enableParallelBuilding = true;
+
   meta = {
     description = "A viewer for remote virtual machines";
     maintainers = [ maintainers.raskin ];
diff --git a/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix b/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix
index 8a339ac83224..7ea83b015592 100644
--- a/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "virt-what-${version}";
+  pname = "virt-what";
   version = "1.19";
 
   src = fetchurl {
-    url = "https://people.redhat.com/~rjones/virt-what/files/${name}.tar.gz";
+    url = "https://people.redhat.com/~rjones/virt-what/files/${pname}-${version}.tar.gz";
     sha256 = "00nhwly5q0ps8yv9cy3c2qp8lfshf3s0kdpwiy5zwk3g77z96rwk";
   };
 
diff --git a/nixpkgs/pkgs/applications/virtualization/virtinst/default.nix b/nixpkgs/pkgs/applications/virtualization/virtinst/default.nix
index 8222fb50a8f9..6931e492e99c 100644
--- a/nixpkgs/pkgs/applications/virtualization/virtinst/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/virtinst/default.nix
@@ -5,7 +5,8 @@ with stdenv.lib;
 let version = "0.600.4"; in
 
 stdenv.mkDerivation rec {
-  name = "virtinst-${version}";
+  pname = "virtinst";
+  inherit version;
 
   src = fetchurl {
     url = "http://virt-manager.org/download/sources/virtinst/virtinst-${version}.tar.gz";
diff --git a/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix b/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix
index 1a6ba5ac5273..20930b865370 100644
--- a/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix
@@ -24,7 +24,8 @@ let
   main = "11sxx2zaablkvjiw0i5g5i5ibak6bsq6fldrcxwbcby6318shnhv";
   version = "6.0.8";
 in stdenv.mkDerivation {
-  name = "virtualbox-${version}";
+  pname = "virtualbox";
+  inherit version;
 
   src = fetchurl {
     url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
diff --git a/nixpkgs/pkgs/applications/virtualization/vpcs/default.nix b/nixpkgs/pkgs/applications/virtualization/vpcs/default.nix
index 3d6efcfc8443..464fe46b499c 100644
--- a/nixpkgs/pkgs/applications/virtualization/vpcs/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/vpcs/default.nix
@@ -1,13 +1,12 @@
 { stdenv, fetchurl, glibc }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
   pname = "vpcs";
   version = "0.8";
 
   src = fetchurl {
-    name = "${name}.tar.bz2";
-    url = "mirror://sourceforge/project/${pname}/${version}/${name}-src.tbz";
+    name = "${pname}-${version}.tar.bz2";
+    url = "mirror://sourceforge/project/${pname}/${version}/${pname}-${version}-src.tbz";
     sha256 = "14y9nflcyq486vvw0na0fkfmg5dac004qb332v4m5a0vaz8059nw";
   };
 
diff --git a/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix b/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix
index 59d642108374..ea8a24e57a34 100644
--- a/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg }:
 stdenv.mkDerivation rec {
-  name = "x11docker-${version}";
+  pname = "x11docker";
   version = "6.0.0";
   src = fetchFromGitHub {
     owner = "mviereck";
diff --git a/nixpkgs/pkgs/applications/virtualization/xhyve/default.nix b/nixpkgs/pkgs/applications/virtualization/xhyve/default.nix
index d3990a70bcac..26b55b364f17 100644
--- a/nixpkgs/pkgs/applications/virtualization/xhyve/default.nix
+++ b/nixpkgs/pkgs/applications/virtualization/xhyve/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, Hypervisor, vmnet, xpc, libobjc, zlib }:
 
 stdenv.mkDerivation rec {
-  name    = "xhyve-${version}";
+  pname = "xhyve";
   version = "20190124";
 
   src = fetchurl {