From c7bba63404baaba40c3ec7c33696447a4d8b8f32 Mon Sep 17 00:00:00 2001 From: "Samuel Hierholzer (Adfinis AG)" Date: Mon, 7 Apr 2025 08:23:03 +0200 Subject: [PATCH] ansible-builder: Add missing dependency packaging --- .../development/python-modules/ansible-builder/default.nix | 7 +++---- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/ansible-builder/default.nix b/pkgs/development/python-modules/ansible-builder/default.nix index 84d32152864b..ff20c5aef2c7 100644 --- a/pkgs/development/python-modules/ansible-builder/default.nix +++ b/pkgs/development/python-modules/ansible-builder/default.nix @@ -3,12 +3,12 @@ setuptools, setuptools-scm, jsonschema, - requirements-parser, pyyaml, podman, fetchPypi, bindep, buildPythonPackage, + packaging, }: buildPythonPackage rec { @@ -33,13 +33,12 @@ buildPythonPackage rec { setuptools-scm ]; - buildInputs = [ bindep ]; - dependencies = [ podman + bindep jsonschema - requirements-parser pyyaml + packaging ]; meta = with lib; { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 99c83287646f..5b333b5a5dd7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -682,7 +682,9 @@ self: super: with self; { ansible = callPackage ../development/python-modules/ansible { }; - ansible-builder = callPackage ../development/python-modules/ansible-builder { }; + ansible-builder = callPackage ../development/python-modules/ansible-builder { + inherit (pkgs) podman; + }; ansible-compat = callPackage ../development/python-modules/ansible-compat { };