diff --git a/overlays/default.nix b/overlays/default.nix index d994a91..d46b68d 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -61,16 +61,6 @@ in rec { }; iteration-utilities = cp ./iteration-utilities.nix {}; jinja2-ansible-filters = cp ./jinja2-ansible-filters.nix {}; - molecule = cp ./molecule.nix {}; - molecule-containers = cp ./molecule-containers.nix { - inherit molecule molecule-docker molecule-podman; - }; - molecule-docker = cp ./molecule-docker.nix { - inherit molecule; - }; - molecule-podman = cp ./molecule-podman.nix { - inherit molecule; - }; pydantic = cp ./pydantic.nix {}; pyyaml-include = cp ./pyyaml-include.nix {}; xonsh-direnv = cp ./xonsh-direnv.nix {}; diff --git a/overlays/molecule-containers.nix b/overlays/molecule-containers.nix deleted file mode 100644 index e217ed2..0000000 --- a/overlays/molecule-containers.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, pkgs, -setuptools, setuptools-scm, setuptools-scm-git-archive, wheel, -molecule, -molecule-docker, -molecule-podman, -}: - -let - pydeps = [ - molecule - molecule-docker - molecule-podman - ]; -in buildPythonPackage rec { - pname = "molecule-containers"; - version = "2.0.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-yD90kAFyhhT5cnhIdVhamaR8vIT7jjfwUkRmDqfUx5w="; - }; - - meta = with lib; { - description = "A pluin for Molecule to run in Podman/Docker containers"; - homepage = "https://github.com/ansible-community/molecule-containers"; - license = licenses.mit; - maintainers = []; - }; - - doCheck = false; - - # Gets pulled into running environments as well - propagatedBuildInputs = pydeps; - - format = "pyproject"; - # Only needed at the buid stage - buildInputs = [ - setuptools - #setuptools-scm - #setuptools-scm-git-archive - #wheel - ]; - - nativeBuildInputs = with pkgs; [ - ]; -} diff --git a/overlays/molecule-docker.nix b/overlays/molecule-docker.nix deleted file mode 100644 index 52d4d27..0000000 --- a/overlays/molecule-docker.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, pkgs, -setuptools, setuptools-scm, setuptools-scm-git-archive, wheel, -docker, -molecule, -selinux-python, -}: - -let - pydeps = [ - docker - molecule - selinux-python - ]; -in buildPythonPackage rec { - pname = "molecule-docker"; - version = "2.1.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-GVuXZzy8IzXPpoEIFt5cv4B1B781Cp0WypiyJLFkcUU="; - }; - - meta = with lib; { - description = "A plugin for Molecule providing Docker resources"; - homepage = "https://github.com/ansible-community/molecule-docker"; - license = licenses.mit; - maintainers = []; - }; - - doCheck = false; - - # Gets pulled into running environments as well - propagatedBuildInputs = pydeps; - - format = "pyproject"; # For when it has only pyproject.toml - # Only needed at the buid stage - buildInputs = [ - setuptools - setuptools-scm - setuptools-scm-git-archive - wheel - ]; - - nativeBuildInputs = with pkgs; [ - ]; -} diff --git a/overlays/molecule-podman.nix b/overlays/molecule-podman.nix deleted file mode 100644 index 2683b06..0000000 --- a/overlays/molecule-podman.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, pkgs, -setuptools, setuptools-scm, setuptools-scm-git-archive, wheel, -molecule, -selinux-python, -}: - -let - pydeps = [ - molecule - selinux-python - ]; -in buildPythonPackage rec { - pname = "molecule-podman"; - version = "2.0.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-zqLqysVPEpgkUw01Rp3de/8QmpTrzYQIgor4wNq/XHo="; - }; - - meta = with lib; { - description = "A plugin for Molecule allowing Podman resources"; - homepage = "https://github.com/ansible-community/molecule-podman"; - license = licenses.mit; - maintainers = []; - }; - - doCheck = false; - - # Gets pulled into running environments as well - propagatedBuildInputs = pydeps; - - format = "pyproject"; # For when it has only pyproject.toml - # Only needed at the buid stage - buildInputs = [ - setuptools - setuptools-scm - setuptools-scm-git-archive - wheel - ]; - - nativeBuildInputs = with pkgs; [ - ]; -} diff --git a/overlays/molecule.nix b/overlays/molecule.nix deleted file mode 100644 index 6c5a3ff..0000000 --- a/overlays/molecule.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, pkgs, -setuptools, setuptools-scm, setuptools-scm-git-archive, wheel, -ansible-compat, -click-help-colors, -cookiecutter, -enrich, -jsonschema, -packaging, -pluggy, -pyyaml, -}: - -let - pydeps = [ - ansible-compat - click-help-colors - cookiecutter - enrich - jsonschema - packaging - pluggy - pyyaml - ]; -in buildPythonPackage rec { - pname = "molecule"; - version = "4.0.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-EzYvdBocgCeaKyX0mh9Vw7/DRQVMX+7c3N+SjhED4eU="; - }; - - meta = with lib; { - description = "A test framework for Ansible."; - homepage = "https://github.com/ansible-community/molecule"; - license = licenses.mit; - maintainers = []; - }; - - doCheck = false; - - # Gets pulled into running environments as well - propagatedBuildInputs = pydeps; - - format = "pyproject"; - # Only needed at the buid stage - buildInputs = [ - setuptools - setuptools-scm - setuptools-scm-git-archive - wheel - ]; - - nativeBuildInputs = with pkgs; [ - ]; -}