diff options
Diffstat (limited to 'pkgs/applications/networking/cluster/nixops')
12 files changed, 24 insertions, 290 deletions
diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 75902de1b9f6b..88c426565fc4e 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -12,25 +12,26 @@ let nixopsContextBase = this: { python = python3.override { + self = this.python; packageOverrides = self: super: { nixops = self.callPackage ./unwrapped.nix { }; } // (this.plugins self super); }; plugins = ps: _super: with ps; rec { - 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-aws = throw "nixops-aws was broken and was removed from nixpkgs"; + 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; }; @@ -41,7 +42,7 @@ let selectedPlugins = []; # selector is a function mapping pythonPackages to a list of plugins - # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-aws ]) + # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-digitalocean ]) withPlugins = selector: this.extend (this: _old: { selectedPlugins = selector this.availablePlugins; @@ -108,14 +109,9 @@ in # Not recommended; too fragile. nixops_unstable_full = minimal.withPlugins (ps: [ - 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 ]); } diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix deleted file mode 100644 index 78b9bc879aaa3..0000000000000 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, unstableGitUpdater -, poetry-core -, boto -, boto3 -, nixops -, nixos-modules-contrib -, typing-extensions -}: - -buildPythonPackage { - pname = "nixops-aws"; - version = "unstable-2024-02-29"; - pyproject = true; - - src = fetchFromGitHub { - owner = "NixOS"; - repo = "nixops-aws"; - rev = "d173b2f14ec767d782ceab45fb22b32fe3b5a1f7"; - hash = "sha256-ocTtc7POt1bugb9Bki2ew2Eh5uc933GftNw1twoOJsc="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace poetry.masonry.api poetry.core.masonry.api \ - --replace "poetry>=" "poetry-core>=" - ''; - - nativeBuildInputs = [ - poetry-core - ]; - - buildInputs = [ - nixops - ]; - - propagatedBuildInputs = [ - boto - boto3 - nixos-modules-contrib - typing-extensions - ]; - - pythonImportsCheck = [ "nixops_aws" ]; - - passthru.updateScript = unstableGitUpdater {}; - - meta = with lib; { - description = "AWS plugin for NixOps"; - homepage = "https://github.com/NixOS/nixops-aws"; - license = licenses.lgpl3Only; - maintainers = nixops.meta.maintainers; - }; -} diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix index f3f62e9407293..a78d4d2cfd997 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix @@ -10,7 +10,7 @@ buildPythonPackage { pname = "nixops-digitalocean"; - version = "unstable-2022-08-14"; + version = "0.1.0-unstable-2022-08-14"; pyproject = true; disabled = pythonOlder "3.7"; @@ -48,6 +48,6 @@ buildPythonPackage { description = "NixOps Digitalocean plugin"; homepage = "https://github.com/nix-community/nixops-digitalocean"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ kiwi ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix index 0dddf771bd517..8b890157a2221 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix @@ -8,7 +8,7 @@ buildPythonPackage { pname = "nixops-encrypted-links"; - version = "unstable-2021-02-16"; + version = "0-unstable-2021-02-16"; pyproject = true; src = fetchFromGitHub { @@ -40,6 +40,6 @@ buildPythonPackage { description = "EncryptedLinksTo from Nixops 1 module port"; homepage = "https://github.com/nix-community/nixops-encrypted-links"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-gce.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-gce.nix deleted file mode 100644 index 604e82114badc..0000000000000 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-gce.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, unstableGitUpdater -, poetry-core -, cryptography -, libcloud -, nixops -, nixos-modules-contrib -}: - -buildPythonPackage { - pname = "nixops-gce"; - version = "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; - }; -} diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-hercules-ci.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-hercules-ci.nix index 90ed88edfa0e9..04044b94da0fd 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-hercules-ci.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-hercules-ci.nix @@ -8,7 +8,7 @@ buildPythonPackage { pname = "nixops-hercules-ci"; - version = "unstable-2021-10-06"; + version = "0-unstable-2021-10-06"; pyproject = true; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetzner.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetzner.nix deleted file mode 100644 index c4d037fe75f5a..0000000000000 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetzner.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, unstableGitUpdater -, poetry-core -, hetzner -, nixops -, nixos-modules-contrib -, typing-extensions -}: - -buildPythonPackage { - pname = "nixops-hetzner"; - version = "unstable-2022-04-23"; - 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 {}; - - meta = with lib; { - description = "Hetzner bare metal NixOps plugin"; - homepage = "https://github.com/NixOS/nixops-hetzner"; - license = licenses.mit; - maintainers = nixops.meta.maintainers; - }; -} diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetznercloud.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetznercloud.nix deleted file mode 100644 index 17e94ab9f32bd..0000000000000 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-hetznercloud.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, unstableGitUpdater -, poetry-core -, hcloud -, nixops -, typing-extensions -}: - -buildPythonPackage { - pname = "nixops-hetznercloud"; - version = "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 = "A NixOps plugin supporting Hetzner Cloud deployments"; - homepage = "https://github.com/lukebfox/nixops-hetznercloud"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ lukebfox ]; - }; -} diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-libvirtd.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-libvirtd.nix deleted file mode 100644 index b3439bf4fe521..0000000000000 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-libvirtd.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, unstableGitUpdater -, poetry-core -, libvirt -, nixops -}: - -buildPythonPackage { - pname = "nixops-libvirtd"; - version = "unstable-2023-09-01"; - pyproject = true; - - src = fetchFromGitHub { - owner = "nix-community"; - repo = "nixops-libvirtd"; - rev = "b59424bf53e74200d684a4bce1ae64d276e793a0"; - hash = "sha256-HxJu8/hOPI5aCddTpna0mf+emESYN3ZxpTkitfKcfVQ="; - }; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace poetry.masonry.api poetry.core.masonry.api \ - --replace "poetry>=" "poetry-core>=" - ''; - - nativeBuildInputs = [ - poetry-core - ]; - - buildInputs = [ - nixops - ]; - - propagatedBuildInputs = [ - libvirt - ]; - - pythonImportsCheck = [ "nixops_virtd" ]; - - passthru.updateScript = unstableGitUpdater {}; - - meta = with lib; { - description = "NixOps libvirtd backend plugin"; - homepage = "https://github.com/nix-community/nixops-libvirtd"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ aminechikhaoui ]; - }; -} diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-vbox.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-vbox.nix index 4a9f0351094c0..3d712e5c23978 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-vbox.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-vbox.nix @@ -8,7 +8,7 @@ buildPythonPackage { pname = "nixops-vbox"; - version = "unstable-2023-08-10"; + version = "1.0.0-unstable-2023-08-10"; pyproject = true; src = fetchFromGitHub { @@ -34,7 +34,9 @@ buildPythonPackage { pythonImportsCheck = [ "nixopsvbox" ]; - passthru.updateScript = unstableGitUpdater {}; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = with lib; { description = "NixOps plugin for VirtualBox VMs"; diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixos-modules-contrib.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixos-modules-contrib.nix index 5c6e9fec32cfd..a3039482c8f1a 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixos-modules-contrib.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixos-modules-contrib.nix @@ -8,7 +8,7 @@ buildPythonPackage { pname = "nixos-modules-contrib"; - version = "unstable-2021-01-20"; + version = "0-unstable-2021-01-20"; pyproject = true; src = fetchFromGitHub { @@ -40,6 +40,6 @@ buildPythonPackage { description = "Useful NixOS modules which may not belong in the Nixpkgs repository itself"; homepage = "https://github.com/nix-community/nixos-modules-contrib"; license = licenses.lgpl3; - maintainers = []; + maintainers = [ ]; }; } diff --git a/pkgs/applications/networking/cluster/nixops/unwrapped.nix b/pkgs/applications/networking/cluster/nixops/unwrapped.nix index 058f7f2d2c1c9..7f00babc15e4f 100644 --- a/pkgs/applications/networking/cluster/nixops/unwrapped.nix +++ b/pkgs/applications/networking/cluster/nixops/unwrapped.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { pname = "nixops"; - version = "unstable-2024-02-28"; + version = "1.7-unstable-2024-02-28"; pyproject = true; src = fetchFromGitHub { @@ -51,11 +51,13 @@ buildPythonApplication rec { passthru = { tests.nixos = nixosTests.nixops.unstable; - updateScript = unstableGitUpdater {}; + updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; }; meta = with lib; { - description = "A tool for deploying to NixOS machines in a network or cloud"; + description = "Tool for deploying to NixOS machines in a network or cloud"; homepage = "https://github.com/NixOS/nixops"; license = licenses.lgpl3Only; maintainers = with lib.maintainers; [ aminechikhaoui roberth ]; |