From b4dcb690f35dcf41d58a09a495657e128899a130 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 6 Oct 2021 13:31:06 +0200 Subject: [PATCH] nixopsUnstable: Add nixops-hercules-ci --- .../networking/cluster/nixops/default.nix | 1 + .../cluster/nixops/poetry-git-overlay.nix | 10 +++++++++ .../networking/cluster/nixops/poetry.lock | 21 ++++++++++++++++++- .../networking/cluster/nixops/pyproject.toml | 1 + 4 files changed, 32 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 4002f7478b33..9eabf0ac1b5d 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -62,6 +62,7 @@ let pkg = interpreter.pkgs.nixops.withPlugins(ps: [ ps.nixops-encrypted-links + ps.nixops-hercules-ci ps.nixops-virtd ps.nixops-aws ps.nixops-gcp diff --git a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix index cc40395d6d97..75b9471c9e09 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix +++ b/pkgs/applications/networking/cluster/nixops/poetry-git-overlay.nix @@ -41,6 +41,16 @@ self: super: { } ); + nixops-hercules-ci = super.nixops-hercules-ci.overridePythonAttrs ( + _: { + src = pkgs.fetchgit { + url = "https://github.com/hercules-ci/nixops-hercules-ci.git"; + rev = "e601d5baffd003fd5f22deeaea0cb96444b054dc"; + sha256 = "0rcpv5hc6l9ia8lq8ivwa80b2pwssmdz8an25lhr4i2472mpx1p0"; + }; + } + ); + nixops-virtd = super.nixops-virtd.overridePythonAttrs ( _: { src = pkgs.fetchgit { diff --git a/pkgs/applications/networking/cluster/nixops/poetry.lock b/pkgs/applications/networking/cluster/nixops/poetry.lock index df03beab90bd..87d8fce2f23c 100644 --- a/pkgs/applications/networking/cluster/nixops/poetry.lock +++ b/pkgs/applications/networking/cluster/nixops/poetry.lock @@ -269,6 +269,24 @@ url = "https://github.com/nix-community/nixops-gce.git" reference = "master" resolved_reference = "712453027486e62e087b9c91e4a8a171eebb6ddd" +[[package]] +name = "nixops-hercules-ci" +version = "0.1.0" +description = "" +category = "main" +optional = false +python-versions = "^3.8" +develop = false + +[package.dependencies] +nixops = {git = "https://github.com/NixOS/nixops.git", branch = "master"} + +[package.source] +type = "git" +url = "https://github.com/hercules-ci/nixops-hercules-ci.git" +reference = "master" +resolved_reference = "e601d5baffd003fd5f22deeaea0cb96444b054dc" + [[package]] name = "nixops-virtd" version = "1.0" @@ -583,7 +601,7 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] [metadata] lock-version = "1.1" python-versions = "^3.8" -content-hash = "bd064837654a0d4a4691b3df01338b92c95a449ff400a9cd49fee843ab13ee92" +content-hash = "8a294b2745b271983bac54258b4f3a2ab3b2e5b218440329fa7eea482c63774f" [metadata.files] alabaster = [ @@ -756,6 +774,7 @@ nixops = [] nixops-aws = [] nixops-encrypted-links = [] nixops-gcp = [] +nixops-hercules-ci = [] nixops-virtd = [] nixopsvbox = [] nixos-modules-contrib = [] diff --git a/pkgs/applications/networking/cluster/nixops/pyproject.toml b/pkgs/applications/networking/cluster/nixops/pyproject.toml index 09ffb54fa2bb..3cd3025b1fa5 100644 --- a/pkgs/applications/networking/cluster/nixops/pyproject.toml +++ b/pkgs/applications/networking/cluster/nixops/pyproject.toml @@ -11,6 +11,7 @@ nixops-aws = {git = "https://github.com/NixOS/nixops-aws.git"} nixops-gcp = {git = "https://github.com/nix-community/nixops-gce.git"} nixopsvbox = {git = "https://github.com/nix-community/nixops-vbox.git"} nixops-encrypted-links = {git = "https://github.com/nix-community/nixops-encrypted-links.git"} +nixops-hercules-ci = {git = "https://github.com/hercules-ci/nixops-hercules-ci.git"} nixops-virtd = {git = "https://github.com/nix-community/nixops-libvirtd.git"} [tool.poetry.dev-dependencies]