diff options
Diffstat (limited to 'pkgs/tools/virtualization')
-rw-r--r-- | pkgs/tools/virtualization/cloud-init/default.nix | 51 | ||||
-rw-r--r-- | pkgs/tools/virtualization/cloudmonkey/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/virtualization/ec2-utils/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/virtualization/linode-cli/default.nix | 8 |
4 files changed, 36 insertions, 29 deletions
diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index dd30969ed8b..6bc070d2cbb 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"; diff --git a/pkgs/tools/virtualization/cloudmonkey/default.nix b/pkgs/tools/virtualization/cloudmonkey/default.nix index 1945e56b96e..00ca3f09d39 100644 --- a/pkgs/tools/virtualization/cloudmonkey/default.nix +++ b/pkgs/tools/virtualization/cloudmonkey/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudmonkey"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "apache"; repo = "cloudstack-cloudmonkey"; rev = version; - sha256 = "sha256-OmVM6ayrtrLl+PADnkUnrssbsq1GZp2KiMBOXPgfi5Y="; + sha256 = "sha256-C9e2KsnoggjWZp8gx757MbFdGxmfh+TtAd+luS3ycHU="; }; runVend = true; diff --git a/pkgs/tools/virtualization/ec2-utils/default.nix b/pkgs/tools/virtualization/ec2-utils/default.nix index 1605bcfa43b..28321910842 100644 --- a/pkgs/tools/virtualization/ec2-utils/default.nix +++ b/pkgs/tools/virtualization/ec2-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, rpmextract, fetchurl, python2, tree }: stdenv.mkDerivation { - name = "ec2-utils"; + pname = "ec2-utils"; version = "0.5.1"; # The url can be determined by booting an "Amazon Linux 2" and running: diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index 3faddb498ba..e47898276d6 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -11,10 +11,10 @@ }: let - sha256 = "1hhbwyhw6nmzb2a88papfca5rjavav6srcnvmbni5l6ln79pgqj7"; + sha256 = "1kvlf9qcl0i7g24s9f2pj25msmlj0cjicjwrnnc65q8qkmk2br9q"; # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. - specVersion = "4.107.0"; - specSha256 = "1z260w0517k3sgd2ygzwzkhq5w9rbkls69mnl84501fpd2nx7qvi"; + specVersion = "4.108.0"; + specSha256 = "17n9wjd0hpkzc2bvsawdvl8hc5285r0n19xq59h4amqb2fhp676w"; spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; sha256 = specSha256; @@ -24,7 +24,7 @@ in buildPythonApplication rec { pname = "linode-cli"; - version = "5.11.1"; + version = "5.12.0"; src = fetchFromGitHub { owner = "linode"; |