From 4ea4876644ba85c59738882e20877497adf86bc6 Mon Sep 17 00:00:00 2001 From: pinpox Date: Fri, 9 May 2025 13:09:51 +0200 Subject: [PATCH] Remove unnecessary file --- clanModules/flake-module.nix | 1 - clanServices/admin/flake-module.nix | 58 ----------------------------- 2 files changed, 59 deletions(-) delete mode 100644 clanServices/admin/flake-module.nix diff --git a/clanModules/flake-module.nix b/clanModules/flake-module.nix index 5ebb7a2ac..7d12cdef8 100644 --- a/clanModules/flake-module.nix +++ b/clanModules/flake-module.nix @@ -8,7 +8,6 @@ in { # only import available files, as this allows to filter the files for tests. flake.clanModules = filterAttrs (_name: pathExists) { - admin = ./admin; auto-upgrade = ./auto-upgrade; borgbackup = ./borgbackup; borgbackup-static = ./borgbackup-static; diff --git a/clanServices/admin/flake-module.nix b/clanServices/admin/flake-module.nix deleted file mode 100644 index 0c85e0630..000000000 --- a/clanServices/admin/flake-module.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ - self, - inputs, - lib, - ... -}: -let - module = lib.modules.importApply ./default.nix { - inherit (self) packages; - }; -in -{ - clan.inventory.modules = { - hello-world = module; - }; - clan.modules = { - hello-world = module; - }; - perSystem = - { pkgs, ... }: - let - # Module that contains the tests - # This module adds: - # - legacyPackages..eval-tests-hello-world - # - checks..eval-tests-hello-world - unit-test-module = ( - self.clanLib.test.flakeModules.makeEvalChecks { - inherit module; - inherit self inputs; - testName = "hello-world"; - tests = ./tests/eval-tests.nix; - # Optional arguments passed to the test - testArgs = { }; - } - ); - in - { - imports = [ unit-test-module ]; - - /** - 1. Prepare the test vars - nix run .#generate-test-vars -- clanServices/hello-world/tests/vm hello-service - - 2. To run the test - nix build .#checks.x86_64-linux.hello-service - */ - checks = - # Currently we don't support nixos-integration tests on darwin - lib.optionalAttrs (pkgs.stdenv.isLinux) { - hello-service = import ./tests/vm/default.nix { - inherit module; - inherit self inputs pkgs; - # clanLib is exposed from inputs.clan-core - clanLib = self.clanLib; - }; - }; - }; -}