diff options
author | Fabian Affolter <mail@fabian-affolter.ch> | 2021-11-28 13:26:00 +0100 |
---|---|---|
committer | Fabian Affolter <mail@fabian-affolter.ch> | 2021-11-28 13:26:00 +0100 |
commit | b3c9ba1d03b2207c2a45eea9c1996fbf11d4c9eb (patch) | |
tree | c0f85cd6cad93ab8a6936a6139abae8227703378 /pkgs/tools/virtualization/cloud-init | |
parent | fc9ee3bc0b9e6d30f76f4b37084711ae03114e21 (diff) |
cloud-init: 21.2 -> 21.4
Diffstat (limited to 'pkgs/tools/virtualization/cloud-init')
-rw-r--r-- | pkgs/tools/virtualization/cloud-init/default.nix | 51 |
1 files changed, 29 insertions, 22 deletions
diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index dd30969ed8bd..6bc070d2cbbf 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -1,36 +1,30 @@ { lib -, fetchFromGitHub , buildPythonApplication -, jinja2 -, oauthlib -, configobj -, pyyaml -, requests -, jsonschema -, jsonpatch -, httpretty -, dmidecode -, pytestCheckHook -, shadow , cloud-utils +, dmidecode +, fetchFromGitHub , openssh +, python3 +, shadow }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "cloud-init"; - version = "21.2"; + version = "21.4"; namePrefix = ""; src = fetchFromGitHub { owner = "canonical"; repo = "cloud-init"; rev = version; - sha256 = "0vhjkgs49ixfa3kkj5s3v3gcxvypm3cdvfk6adrk2bx3wv2cbhvz"; + sha256 = "09413qz9y2csvhjb4krjnkfj97vlykx79j912p27jjcrg82f1nib"; }; patches = [ ./0001-add-nixos-support.patch ]; + prePatch = '' - substituteInPlace setup.py --replace /lib/systemd $out/lib/systemd + substituteInPlace setup.py \ + --replace /lib/systemd $out/lib/systemd ''; postInstall = '' @@ -40,17 +34,18 @@ buildPythonApplication rec { done ''; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ + configobj jinja2 + jsonpatch + jsonschema + netifaces oauthlib - configobj pyyaml requests - jsonschema - jsonpatch ]; - checkInputs = [ + checkInputs = with python3.pkgs; [ pytestCheckHook httpretty dmidecode @@ -78,6 +73,16 @@ buildPythonApplication rec { "TestInstallChefOmnibus" # https://github.com/canonical/cloud-init/pull/893 "TestGetPackageMirrorInfo" + # Disable failing VMware and PuppetAio tests + "test_get_data_iso9660_with_network_config" + "test_get_data_vmware_guestinfo_with_network_config" + "test_get_host_info" + "test_no_data_access_method" + "test_install_with_collection" + "test_install_with_custom_url" + "test_install_with_default_arguments" + "test_install_with_no_cleanup" + "test_install_with_version" ]; disabledTestPaths = [ @@ -99,7 +104,9 @@ buildPythonApplication rec { export TMPDIR=/tmp ''; - pythonImportsCheck = [ "cloudinit" ]; + pythonImportsCheck = [ + "cloudinit" + ]; meta = with lib; { homepage = "https://cloudinit.readthedocs.org"; |