From 575910f29fac2fad409c2ada0102b9a3364835b2 Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Wed, 22 Oct 2025 15:02:16 +0200 Subject: [PATCH] remove the (so far unused) model options (#545) Reviewed-on: https://git.fediversity.eu/fediversity/fediversity/pulls/545 --- deployment/check/data-model-ssh/nixosTest.nix | 5 ---- deployment/check/data-model-ssh/options.nix | 15 ----------- deployment/check/data-model-tf/nixosTest.nix | 4 --- deployment/check/data-model-tf/options.nix | 25 ------------------- 4 files changed, 49 deletions(-) delete mode 100644 deployment/check/data-model-ssh/options.nix delete mode 100644 deployment/check/data-model-tf/options.nix diff --git a/deployment/check/data-model-ssh/nixosTest.nix b/deployment/check/data-model-ssh/nixosTest.nix index 27e5bbb2..5efdadc8 100644 --- a/deployment/check/data-model-ssh/nixosTest.nix +++ b/deployment/check/data-model-ssh/nixosTest.nix @@ -19,10 +19,6 @@ let in { _class = "nixosTest"; - imports = [ - ./options.nix - ]; - name = "deployment-model"; sourceFileset = lib.fileset.unions [ ../../data-model.nix @@ -31,7 +27,6 @@ in ../../run/ssh-single-host/run.sh ../../../npins/default.nix ../../../npins/sources.json - ./options.nix ./constants.nix ]; diff --git a/deployment/check/data-model-ssh/options.nix b/deployment/check/data-model-ssh/options.nix deleted file mode 100644 index 34153b04..00000000 --- a/deployment/check/data-model-ssh/options.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - lib, - ... -}: -let - inherit (lib) mkOption types; -in -{ - options = { - targetSystem = mkOption { - type = types.str; - description = "name of the host to deploy to"; - }; - }; -} diff --git a/deployment/check/data-model-tf/nixosTest.nix b/deployment/check/data-model-tf/nixosTest.nix index b0ca8e20..4bbca5f1 100644 --- a/deployment/check/data-model-tf/nixosTest.nix +++ b/deployment/check/data-model-tf/nixosTest.nix @@ -28,10 +28,6 @@ let in { _class = "nixosTest"; - imports = [ - ./options.nix - ]; - name = "deployment-model"; sourceFileset = lib.fileset.unions [ ../../run/tf-single-host/run.sh diff --git a/deployment/check/data-model-tf/options.nix b/deployment/check/data-model-tf/options.nix deleted file mode 100644 index 0e415cf7..00000000 --- a/deployment/check/data-model-tf/options.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - ... -}: -let - inherit (lib) mkOption types; -in -{ - options = { - targetSystem = mkOption { - type = types.str; - description = "name of the host to deploy to"; - }; - sshOpts = mkOption { - description = "Extra SSH options (`-o`) to use."; - type = types.listOf types.str; - default = [ ]; - example = "ConnectTimeout=60"; - }; - httpBackend = mkOption { - description = "environment variables to configure the TF HTTP back-end, see "; - type = types.attrsOf (types.either types.str types.int); - }; - }; -}