Merge pull request #327279 from Mic92/nixops (d05ec2ca) · Commits · nix / nixpkgs

pkgs/applications/networking/cluster/nixops/default.nix

+7 −10

Original line number	Diff line number	Diff line
		@@ -22,16 +22,16 @@ let
		nixops-aws = callPackage ./plugins/nixops-aws.nix { };
		nixops-digitalocean = callPackage ./plugins/nixops-digitalocean.nix { };
		nixops-encrypted-links = callPackage ./plugins/nixops-encrypted-links.nix { };
		nixops-gce = callPackage ./plugins/nixops-gce.nix { };
		nixops-hercules-ci = callPackage ./plugins/nixops-hercules-ci.nix { };
		nixops-hetzner = callPackage ./plugins/nixops-hetzner.nix { };
		nixops-hetznercloud = callPackage ./plugins/nixops-hetznercloud.nix { };
		nixops-libvirtd = callPackage ./plugins/nixops-libvirtd.nix { };
		nixops-vbox = callPackage ./plugins/nixops-vbox.nix { };
		nixos-modules-contrib = callPackage ./plugins/nixos-modules-contrib.nix { };

		nixops-gce = throw "nixops-gce was broken and was removed from nixpkgs";
		nixops-libvirtd = throw "nixops-libvirtd was broken and was removed from nixpkgs";
		nixops-hetzner = throw "nixops-hetzner was broken and was removed from nixpkgs";
		nixops-hetznercloud = throw "nixops-hetznercloud was broken and was removed from nixpkgs";

		# aliases for backwards compatibility
		nixops-gcp = nixops-gce;
		nixops-virtd = nixops-libvirtd;
		nixopsvbox = nixops-vbox;
		};
		@@ -109,14 +109,11 @@ in

		# Not recommended; too fragile.
		nixops_unstable_full = minimal.withPlugins (ps: [
		ps.nixops-aws
		# currently broken
		# ps.nixops-aws
		ps.nixops-digitalocean
		ps.nixops-encrypted-links
		ps.nixops-gce
		ps.nixops-hercules-ci
		ps.nixops-hetzner
		ps.nixops-hetznercloud
		ps.nixops-libvirtd
		ps.nixops-vbox
		]);
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ buildPythonPackage {
		description = "AWS plugin for NixOps";
		homepage = "https://github.com/NixOS/nixops-aws";
		license = licenses.lgpl3Only;
		broken = true; # fails with `nose-1.3.7 not supported for interpreter python3.12`
		maintainers = nixops.meta.maintainers;
		};
		}

deleted100644 → 0

+0 −55

Original line number	Diff line number	Diff line
		{ lib
		, buildPythonPackage
		, fetchFromGitHub
		, unstableGitUpdater
		, poetry-core
		, cryptography
		, libcloud
		, nixops
		, nixos-modules-contrib
		}:

		buildPythonPackage {
		pname = "nixops-gce";
		version = "0-unstable-2023-05-26";
		pyproject = true;

		src = fetchFromGitHub {
		owner = "nix-community";
		repo = "nixops-gce";
		rev = "d13cb794aef763338f544010ceb1816fe31d7f42";
		hash = "sha256-UkYf6CoUrr8yuQoe/ik6vu+UCi3ByJd0BdkS9SLEp0Q=";
		};

		postPatch = ''
		substituteInPlace pyproject.toml \
		--replace poetry.masonry.api poetry.core.masonry.api \
		--replace "poetry>=" "poetry-core>="
		'';

		nativeBuildInputs = [
		poetry-core
		];

		buildInputs = [
		nixops
		];

		propagatedBuildInputs = [
		cryptography
		libcloud
		nixos-modules-contrib
		];

		pythonImportsCheck = [ "nixops_gcp" ];

		passthru.updateScript = unstableGitUpdater {};

		meta = with lib; {
		description = "NixOps Google Cloud Backend";
		homepage = "https://github.com/nix-community/nixops-gce";
		license = licenses.mit;
		maintainers = nixops.meta.maintainers;
		broken = true; # never built on Hydra
		};
		}

deleted100644 → 0

+0 −57

Original line number	Diff line number	Diff line
		{ lib
		, buildPythonPackage
		, fetchFromGitHub
		, unstableGitUpdater
		, poetry-core
		, hetzner
		, nixops
		, nixos-modules-contrib
		, typing-extensions
		}:

		buildPythonPackage {
		pname = "nixops-hetzner";
		version = "1.0.1-unstable-2022-04-24";
		pyproject = true;

		src = fetchFromGitHub {
		owner = "NixOS";
		repo = "nixops-hetzner";
		rev = "bc7a68070c7371468bcc8bf6e36baebc6bd2da35";
		hash = "sha256-duK1Ui4VpbGSgGvfjTOddHSqHZ1FSy4L9Egg+FvZv04=";
		};

		postPatch = ''
		substituteInPlace pyproject.toml \
		--replace poetry.masonry.api poetry.core.masonry.api \
		--replace "poetry>=" "poetry-core>="
		'';

		nativeBuildInputs = [
		poetry-core
		];

		buildInputs = [
		nixops
		];

		propagatedBuildInputs = [
		hetzner
		nixos-modules-contrib
		typing-extensions
		];

		pythonImportsCheck = [ "nixops_hetzner" ];

		passthru.updateScript = unstableGitUpdater {
		tagPrefix = "v";
		};

		meta = with lib; {
		description = "Hetzner bare metal NixOps plugin";
		homepage = "https://github.com/NixOS/nixops-hetzner";
		license = licenses.mit;
		maintainers = nixops.meta.maintainers;
		broken = true; # never built on Hydra
		};
		}

deleted100644 → 0

+0 −53

Original line number	Diff line number	Diff line
		{ lib
		, buildPythonPackage
		, fetchFromGitHub
		, unstableGitUpdater
		, poetry-core
		, hcloud
		, nixops
		, typing-extensions
		}:

		buildPythonPackage {
		pname = "nixops-hetznercloud";
		version = "0-unstable-2023-02-19";
		pyproject = true;

		src = fetchFromGitHub {
		owner = "lukebfox";
		repo = "nixops-hetznercloud";
		rev = "e14f340f7ffe9e2aa7ffbaac0b8a2e3b4cc116b3";
		hash = "sha256-IsRJUUAfN6YXcue80qlcunkawUtgMiMU8mM6DP+7Cm4=";
		};

		postPatch = ''
		substituteInPlace pyproject.toml \
		--replace poetry.masonry.api poetry.core.masonry.api \
		--replace "poetry>=" "poetry-core>="
		'';

		nativeBuildInputs = [
		poetry-core
		];

		buildInputs = [
		nixops
		];

		propagatedBuildInputs = [
		hcloud
		typing-extensions
		];

		pythonImportsCheck = [ "nixops_hetznercloud" ];

		passthru.updateScript = unstableGitUpdater {};

		meta = with lib; {
		description = "NixOps plugin supporting Hetzner Cloud deployments";
		homepage = "https://github.com/lukebfox/nixops-hetznercloud";
		license = licenses.lgpl3Only;
		maintainers = with maintainers; [ lukebfox ];
		broken = true; # never built on Hydra
		};
		}