mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-03-22 12:03:57 +00:00
Code Issues Wiki Activity

Merge pull request #129340 from fabaff/fix-cloud-init

Browse source
This commit is contained in:
Sandro 2021-07-05 18:58:02 +02:00 committed by GitHub
parent 116e7cef33 e011c42e37
commit 9de42ed3ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
pkgs/tools/virtualization/cloud-init/default.nix
View file

@ -18,14 +18,14 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "cloud-init"; pname = "cloud-init";
version = "20.3"; version = "21.2";
namePrefix = ""; namePrefix = "";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "canonical"; owner = "canonical";
repo = "cloud-init"; repo = "cloud-init";
rev = version; rev = version;
sha256 = "1fmckxf4q4sxjqs758vw7ca0rnhl9hyq67cqpqzz2v3s1gqzjhm4"; sha256 = "0vhjkgs49ixfa3kkj5s3v3gcxvypm3cdvfk6adrk2bx3wv2cbhvz";
}; };
patches = [ ./0001-add-nixos-support.patch ]; patches = [ ./0001-add-nixos-support.patch ];
@ -59,9 +59,7 @@ buildPythonApplication rec {
]; ];
makeWrapperArgs = [ makeWrapperArgs = [
"--prefix PATH : ${lib.makeBinPath [ "--prefix PATH : ${lib.makeBinPath [ dmidecode cloud-utils.guest ]}/bin"
dmidecode cloud-utils.guest
]}/bin"
]; ];
disabledTests = [ disabledTests = [
@ -71,6 +69,27 @@ buildPythonApplication rec {
"test_path_env_gets_set_from_main" "test_path_env_gets_set_from_main"
# tries to read from /etc/ca-certificates.conf while inside the sandbox # tries to read from /etc/ca-certificates.conf while inside the sandbox
"test_handler_ca_certs" "test_handler_ca_certs"
# Doesn't work in the sandbox
"TestEphemeralDhcpNoNetworkSetup"
"TestHasURLConnectivity"
"TestReadFileOrUrl"
"TestConsumeUserDataHttp"
# Chef Omnibus
"TestInstallChefOmnibus"
];
disabledTestPaths = [
# Oracle tests are not passing
"cloudinit/sources/tests/test_oracle.py"
# Disable the integration tests. pycloudlib would be required
"tests/unittests/test_datasource/test_aliyun.py"
"tests/unittests/test_datasource/test_azure.py"
"tests/unittests/test_datasource/test_ec2.py"
"tests/unittests/test_datasource/test_exoscale.py"
"tests/unittests/test_datasource/test_gce.py"
"tests/unittests/test_datasource/test_openstack.py"
"tests/unittests/test_datasource/test_scaleway.py"
"tests/unittests/test_ec2_util.py"
]; ];
preCheck = '' preCheck = ''
@ -78,6 +97,8 @@ buildPythonApplication rec {
export TMPDIR=/tmp export TMPDIR=/tmp
''; '';
pythonImportsCheck = [ "cloudinit" ];
meta = with lib; { meta = with lib; {
homepage = "https://cloudinit.readthedocs.org"; homepage = "https://cloudinit.readthedocs.org";
description = "Provides configuration and customization of cloud instance"; description = "Provides configuration and customization of cloud instance";