From 91f7f21b0ce887f6f2a523b4227dda0ade5f90ec Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Mon, 7 Jul 2025 16:29:38 +0200 Subject: [PATCH] Templates: remove 'minimal-flake-parts' --- .../clan_cli/tests/test_clan_nix_attrset.py | 1 - templates/clan/minimal-flake-parts/.gitignore | 2 -- templates/clan/minimal-flake-parts/checks.nix | 22 ------------- templates/clan/minimal-flake-parts/clan.nix | 13 -------- .../clan/minimal-flake-parts/devshells.nix | 17 ---------- templates/clan/minimal-flake-parts/flake.nix | 31 ------------------- .../clan/minimal-flake-parts/formatter.nix | 10 ------ templates/flake.nix | 4 --- 8 files changed, 100 deletions(-) delete mode 100644 templates/clan/minimal-flake-parts/.gitignore delete mode 100644 templates/clan/minimal-flake-parts/checks.nix delete mode 100644 templates/clan/minimal-flake-parts/clan.nix delete mode 100644 templates/clan/minimal-flake-parts/devshells.nix delete mode 100644 templates/clan/minimal-flake-parts/flake.nix delete mode 100644 templates/clan/minimal-flake-parts/formatter.nix diff --git a/pkgs/clan-cli/clan_cli/tests/test_clan_nix_attrset.py b/pkgs/clan-cli/clan_cli/tests/test_clan_nix_attrset.py index 09a9d7520..458185d7e 100644 --- a/pkgs/clan-cli/clan_cli/tests/test_clan_nix_attrset.py +++ b/pkgs/clan-cli/clan_cli/tests/test_clan_nix_attrset.py @@ -45,7 +45,6 @@ def test_clan_core_templates( "default", "flake-parts", "minimal", - "minimal-flake-parts", ] # clan.default diff --git a/templates/clan/minimal-flake-parts/.gitignore b/templates/clan/minimal-flake-parts/.gitignore deleted file mode 100644 index 4812d58f9..000000000 --- a/templates/clan/minimal-flake-parts/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -result -.direnv/ diff --git a/templates/clan/minimal-flake-parts/checks.nix b/templates/clan/minimal-flake-parts/checks.nix deleted file mode 100644 index 8de32fa02..000000000 --- a/templates/clan/minimal-flake-parts/checks.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ self, ... }: -{ - perSystem = - { - self', - lib, - system, - ... - }: - { - checks = - let - nixosMachines = lib.mapAttrs' ( - name: config: lib.nameValuePair "nixos-${name}" config.config.system.build.toplevel - ) ((lib.filterAttrs (_: config: config.pkgs.system == system)) self.nixosConfigurations); - - packages = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") self'.packages; - devShells = lib.mapAttrs' (n: lib.nameValuePair "devShell-${n}") self'.devShells; - in - nixosMachines // packages // devShells; - }; -} diff --git a/templates/clan/minimal-flake-parts/clan.nix b/templates/clan/minimal-flake-parts/clan.nix deleted file mode 100644 index 507900c94..000000000 --- a/templates/clan/minimal-flake-parts/clan.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ self, inputs, ... }: -{ - imports = [ - inputs.clan.flakeModules.default - ]; - clan = { - meta.name = "__CHANGE_ME__"; - inherit self; - specialArgs = { - inherit inputs; - }; - }; -} diff --git a/templates/clan/minimal-flake-parts/devshells.nix b/templates/clan/minimal-flake-parts/devshells.nix deleted file mode 100644 index 43a2d86db..000000000 --- a/templates/clan/minimal-flake-parts/devshells.nix +++ /dev/null @@ -1,17 +0,0 @@ -_: { - perSystem = - { - pkgs, - inputs', - ... - }: - { - devShells = { - default = pkgs.mkShellNoCC { - packages = [ - inputs'.clan.packages.default - ]; - }; - }; - }; -} diff --git a/templates/clan/minimal-flake-parts/flake.nix b/templates/clan/minimal-flake-parts/flake.nix deleted file mode 100644 index 63afbb405..000000000 --- a/templates/clan/minimal-flake-parts/flake.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - - inputs = { - clan.url = "https://git.clan.lol/clan/clan-core/archive/main.tar.gz"; - nixpkgs.follows = "clan/nixpkgs"; - - flake-parts.url = "github:hercules-ci/flake-parts"; - flake-parts.inputs.nixpkgs-lib.follows = "clan/nixpkgs"; - }; - - outputs = - inputs@{ flake-parts, ... }: - flake-parts.lib.mkFlake { inherit inputs; } ( - { ... }: - { - systems = [ - "x86_64-linux" - "aarch64-linux" - "x86_64-darwin" - "aarch64-darwin" - ]; - - imports = [ - ./checks.nix - ./clan.nix - ./devshells.nix - ./formatter.nix - ]; - } - ); -} diff --git a/templates/clan/minimal-flake-parts/formatter.nix b/templates/clan/minimal-flake-parts/formatter.nix deleted file mode 100644 index ec092fae4..000000000 --- a/templates/clan/minimal-flake-parts/formatter.nix +++ /dev/null @@ -1,10 +0,0 @@ -_: { - perSystem = - { - pkgs, - ... - }: - { - formatter = pkgs.nixfmt; - }; -} diff --git a/templates/flake.nix b/templates/flake.nix index 7683b5ea6..f905c53b3 100644 --- a/templates/flake.nix +++ b/templates/flake.nix @@ -35,10 +35,6 @@ description = "Flake-parts"; path = ./clan/flake-parts; }; - minimal-flake-parts = { - description = "Minimal flake-parts clan template"; - path = ./clan/minimal-flake-parts; - }; }; }; in