11 files changed, 49 insertions, 76 deletions
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index ade0ba531cfa..8aa7ad8e3911 100644
--- a/nixos/modules/virtualisation/libvirtd.nix
+++ b/nixos/modules/virtualisation/libvirtd.nix
@@ -102,7 +102,7 @@ in {
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = with pkgs; [ libvirt netcat-openbsd ];
+    environment.systemPackages = with pkgs; [ libvirt netcat-openbsd qemu_kvm ];
 
     boot.kernelModules = [ "tun" ];
 
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index 121875a69de7..98fb53e57dd4 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
     export OUTPUT_FD=$fd
 
     for file in \
-      "${edk2.src}"/{UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg};
+      "${edk2.src}"/{UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg,FatPkg,CryptoPkg,SourceLevelDebugPkg};
     do
       ln -sv "$file" .
     done
diff --git a/pkgs/applications/virtualization/docker-distribution/default.nix b/pkgs/applications/virtualization/docker-distribution/default.nix
index c3c0de149668..0af9abc852ef 100644
--- a/pkgs/applications/virtualization/docker-distribution/default.nix
+++ b/pkgs/applications/virtualization/docker-distribution/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "distribution-${version}";
-  version = "2.6.0";
+  version = "2.6.2";
   rev = "v${version}";
 
   goPackagePath = "github.com/docker/distribution";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     owner = "docker";
     repo = "distribution";
     inherit rev;
-    sha256 = "1yg2zrikn3vkvkx5mn51p6bfjk840qdkn7ahhhvvcsc8mpigrjc6";
+    sha256 = "0nj4xd72mik4pj8g065cqb0yjmgpj5ppsqf2k5ibz9f68c39c00b";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix
index 1e6e0e8c1f6b..b3e2ff909b7f 100644
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, libuuid, python2, iasl }:
+{ stdenv, fetchFromGitHub, libuuid, python2, iasl }:
 
 let
   pythonEnv = python2.withPackages(ps: [ps.tkinter]);
@@ -13,10 +13,11 @@ else
 edk2 = stdenv.mkDerivation {
   name = "edk2-2014-12-10";
 
-  src = fetchgit {
-    url = git://github.com/tianocore/edk2;
-    rev = "684a565a04";
-    sha256 = "0s9ywb8w7xzlnmm4kwzykxkrdaw53b7pky121cc9wjkllzqwyxrb";
+  src = fetchFromGitHub {
+    owner = "tianocore";
+    repo = "edk2";
+    rev = "vUDK2017";
+    sha256 = "0sswa028644yr8fbl8j6rhrdm717fj29h4dys3ygklmjhss90a2g";
   };
 
   buildInputs = [ libuuid pythonEnv];
diff --git a/pkgs/development/python-modules/pyramid_beaker/default.nix b/pkgs/development/python-modules/pyramid_beaker/default.nix
index 517f068edd9c..a95c67b96d29 100644
--- a/pkgs/development/python-modules/pyramid_beaker/default.nix
+++ b/pkgs/development/python-modules/pyramid_beaker/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   checkPhase = ''
     # https://github.com/Pylons/pyramid_beaker/issues/29
-    py.test -k 'not test_includeme'
+    py.test -k 'not test_includeme' pyramid_beaker/tests.py
   '';
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/ansible/2.1.nix b/pkgs/tools/admin/ansible/2.1.nix
index 6c7f20905238..5a20b5256076 100644
--- a/pkgs/development/python-modules/ansible/2.1.nix
+++ b/pkgs/tools/admin/ansible/2.1.nix
@@ -1,19 +1,11 @@
-{ lib
+{ stdenv
 , fetchurl
-, buildPythonPackage
-, pycrypto
-, paramiko
-, jinja2
-, pyyaml
-, httplib2
-, boto
-, six
-, netaddr
-, dns
+, pythonPackages
 , windowsSupport ? false
-, pywinrm ? null
 }:
 
+with pythonPackages;
+
 let
   jinja = jinja2.override rec {
     pname = "Jinja2";
@@ -45,17 +37,18 @@ in buildPythonPackage rec {
   dontPatchELF = true;
   dontPatchShebangs = false;
 
-  propagatedBuildInputs = [ pycrypto paramiko jinja pyyaml httplib2
-    boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm;
+  propagatedBuildInputs = [
+    pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dns
+  ] ++ stdenv.lib.optional windowsSupport pywinrm;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.ansible.com;
     description = "A simple automation tool";
-    license = with lib.licenses; [ gpl3] ;
-    maintainers = with lib.maintainers; [
+    license = with licenses; [ gpl3] ;
+    maintainers = with maintainers; [
       jgeerds
       joamaki
     ];
-    platforms = with lib.platforms; linux ++ darwin;
+    platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/development/python-modules/ansible/2.2.nix b/pkgs/tools/admin/ansible/2.2.nix
index 48e3be966959..528dbf0e97bc 100644
--- a/pkgs/development/python-modules/ansible/2.2.nix
+++ b/pkgs/tools/admin/ansible/2.2.nix
@@ -1,19 +1,11 @@
-{ lib
+{ stdenv
 , fetchurl
-, buildPythonPackage
-, pycrypto
-, paramiko
-, jinja2
-, pyyaml
-, httplib2
-, boto
-, six
-, netaddr
-, dns
+, pythonPackages
 , windowsSupport ? false
-, pywinrm ? null
 }:
 
+with pythonPackages;
+
 let
   # Shouldn't be needed anymore in next version
   # https://github.com/NixOS/nixpkgs/pull/22345#commitcomment-20718521
@@ -46,17 +38,18 @@ in buildPythonPackage rec {
   dontPatchELF = true;
   dontPatchShebangs = false;
 
-  propagatedBuildInputs = [ pycrypto paramiko jinja pyyaml httplib2
-    boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm;
+  propagatedBuildInputs = [
+    pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dns
+  ] ++ stdenv.lib.optional windowsSupport pywinrm;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.ansible.com;
     description = "A simple automation tool";
-    license = with lib.licenses; [ gpl3] ;
-    maintainers = with lib.maintainers; [
+    license = with licenses; [ gpl3] ;
+    maintainers = with maintainers; [
       jgeerds
       joamaki
     ];
-    platforms = with lib.platforms; linux ++ darwin;
+    platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/development/python-modules/ansible/2.3.nix b/pkgs/tools/admin/ansible/2.3.nix
index 36fb44498b5d..599ea75836c9 100644
--- a/pkgs/development/python-modules/ansible/2.3.nix
+++ b/pkgs/tools/admin/ansible/2.3.nix
@@ -1,25 +1,14 @@
-{ lib
+{ stdenv
 , fetchurl
-, buildPythonPackage
-, pycrypto
-, paramiko
-, jinja2
-, pyyaml
-, httplib2
-, boto
-, six
-, netaddr
-, dns
+, pythonPackages
 , windowsSupport ? false
-, pywinrm ? null
 }:
 
-buildPythonPackage rec {
+pythonPackages.buildPythonPackage rec {
   pname = "ansible";
   version = "2.3.1.0";
   name = "${pname}-${version}";
 
-
   src = fetchurl {
     url = "http://releases.ansible.com/ansible/${name}.tar.gz";
     sha256 = "1xdr82fy8gahxh3586wm5k1bxksys7yl1f2n24shrk8gf99qyjyd";
@@ -34,17 +23,18 @@ buildPythonPackage rec {
   dontPatchELF = true;
   dontPatchShebangs = false;
 
-  propagatedBuildInputs = [ pycrypto paramiko jinja2 pyyaml httplib2
-    boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm;
+  propagatedBuildInputs = with pythonPackages; [
+    pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dns
+  ] ++ stdenv.lib.optional windowsSupport pywinrm;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.ansible.com;
     description = "A simple automation tool";
-    license = with lib.licenses; [ gpl3] ;
-    maintainers = with lib.maintainers; [
+    license = with licenses; [ gpl3] ;
+    maintainers = with maintainers; [
       jgeerds
       joamaki
     ];
-    platforms = with lib.platforms; linux ++ darwin;
+    platforms = with platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix
index 4c390f1e80e2..cb2109e195ea 100644
--- a/pkgs/tools/misc/kargo/default.nix
+++ b/pkgs/tools/misc/kargo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python2Packages }:
+{ stdenv, fetchurl, python2Packages, ansible2 }:
 
 python2Packages.buildPythonApplication rec {
   version = "0.4.6";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5bba04cbbff..af69e1c944ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6618,8 +6618,11 @@ with pkgs;
 
   augeas = callPackage ../tools/system/augeas { };
 
-  ansible  = python2Packages.ansible2;
-  ansible2 = python2Packages.ansible2;
+  ansible_2_1 = callPackage ../tools/admin/ansible/2.1.nix {};
+  ansible_2_2 = callPackage ../tools/admin/ansible/2.2.nix {};
+  ansible_2_3 = callPackage ../tools/admin/ansible/2.3.nix {};
+  ansible  = ansible_2_3;
+  ansible2 = ansible_2_3;
 
   antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e22b56dd7fe2..03808ed07894 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -519,13 +519,6 @@ in {
 
   amqplib = callPackage ../development/python-modules/amqplib {};
 
-  ansible  = self.ansible2;
-  ansible2 = self.ansible_2_3;
-
-  ansible_2_1 = callPackage ../development/python-modules/ansible/2.1.nix {};
-  ansible_2_2 = callPackage ../development/python-modules/ansible/2.2.nix {};
-  ansible_2_3 = callPackage ../development/python-modules/ansible/2.3.nix {};
-
   apipkg = callPackage ../development/python-modules/apipkg {};
 
   appdirs = callPackage ../development/python-modules/appdirs { };