Merge branch 'master' into closure-size

pkgs/tools/virtualization/cloud-init/default.nix

@@ -3,7 +3,7 @@
 let version = "0.7.6";
 
 in pythonPackages.buildPythonPackage rec {
-  name = "cloud-init-0.7.6";
+  name = "cloud-init-${version}";
   namePrefix = "";
 
   src = fetchurl {
@@ -11,20 +11,19 @@ in pythonPackages.buildPythonPackage rec {
     sha256 = "1mry5zdkfaq952kn1i06wiggc66cqgfp6qgnlpk0mr7nnwpd53wy";
   };
 
-  preBuild = ''
+  patchPhase = ''
     patchShebangs ./tools
 
     substituteInPlace setup.py \
       --replace /usr $out \
       --replace /etc $out/etc \
       --replace /lib/systemd $out/lib/systemd \
+      --replace 'self.init_system = ""' 'self.init_system = "systemd"'
     '';
 
-  pythonPath = with pythonPackages; [ cheetah jinja2 prettytable
+  propagatedBuildInputs = with pythonPackages; [ cheetah jinja2 prettytable
     oauth pyserial configobj pyyaml argparse requests jsonpatch ];
 
-  setupPyInstallFlags = ["--init-system systemd"];
-
   meta = {
     homepage = http://cloudinit.readthedocs.org;
     description = "provides configuration and customization of cloud instance";