diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/virtualization/cloud-init')
-rw-r--r-- | nixpkgs/pkgs/tools/virtualization/cloud-init/0001-add-nixos-support.patch | 8 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/tools/virtualization/cloud-init/0001-add-nixos-support.patch b/nixpkgs/pkgs/tools/virtualization/cloud-init/0001-add-nixos-support.patch index 2e293321ac02..57fcef6fe661 100644 --- a/nixpkgs/pkgs/tools/virtualization/cloud-init/0001-add-nixos-support.patch +++ b/nixpkgs/pkgs/tools/virtualization/cloud-init/0001-add-nixos-support.patch @@ -1,8 +1,8 @@ diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py -index 7b83df8d..6d04de1a 100644 +index 79e26235..bdc32c52 100644 --- a/cloudinit/distros/__init__.py +++ b/cloudinit/distros/__init__.py -@@ -75,6 +75,7 @@ OSFAMILIES = { +@@ -91,6 +91,7 @@ OSFAMILIES = { ], "openeuler": ["openeuler"], "OpenCloudOS": ["OpenCloudOS", "TencentOS"], @@ -12,7 +12,7 @@ index 7b83df8d..6d04de1a 100644 LOG = logging.getLogger(__name__) diff --git a/cloudinit/distros/nixos.py b/cloudinit/distros/nixos.py new file mode 100644 -index 00000000..954e564b +index 00000000..67c049b8 --- /dev/null +++ b/cloudinit/distros/nixos.py @@ -0,0 +1,109 @@ @@ -38,11 +38,11 @@ index 00000000..954e564b +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + ++import logging +import os + +from cloudinit import distros +from cloudinit import helpers -+from cloudinit import log as logging +from cloudinit import util +from cloudinit import atomic_helper + diff --git a/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix b/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix index 72a67045f56b..2bbdf2104954 100644 --- a/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix @@ -17,14 +17,14 @@ python3.pkgs.buildPythonApplication rec { pname = "cloud-init"; - version = "23.3.3"; + version = "23.4.3"; namePrefix = ""; src = fetchFromGitHub { owner = "canonical"; repo = "cloud-init"; rev = "refs/tags/${version}"; - hash = "sha256-49UvGrv40hyR3A2BndlQKwQqCC1ZaLm97IUKNW12sJo="; + hash = "sha256-oYZr0Zvo6hn9sWtgSAGgfK2stHO247f0WUbzIIWUP18="; }; patches = [ |