diff --git a/flake.lock b/flake.lock index 8aa9eb5..843527d 100644 --- a/flake.lock +++ b/flake.lock @@ -1,190 +1,5 @@ { "nodes": { - "checkmate": { - "inputs": { - "checkmate": "checkmate_2", - "den": [ - "den" - ], - "flake-aspects": [ - "flake-aspects" - ], - "flake-file": [ - "flake-file" - ], - "flake-parts": [ - "flake-parts" - ], - "import-tree": [ - "import-tree" - ], - "nix-unit": [ - "nix-unit" - ], - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-lib": [ - "nixpkgs" - ], - "systems": [ - "systems" - ], - "target": [ - "target" - ], - "treefmt-nix": [ - "treefmt-nix" - ] - }, - "locked": { - "lastModified": 1763694353, - "narHash": "sha256-W5U42yzaKukUDDggnq1gaVo8dATcuDoj5kVt7cqFD6E=", - "owner": "vic", - "repo": "checkmate", - "rev": "f2bbf487cb5e730f357faef65ecb73fa12a568b5", - "type": "github" - }, - "original": { - "owner": "vic", - "repo": "checkmate", - "type": "github" - } - }, - "checkmate_2": { - "inputs": { - "checkmate": "checkmate_3", - "den": [ - "checkmate", - "den" - ], - "flake-aspects": [ - "checkmate", - "flake-aspects" - ], - "flake-file": [ - "checkmate", - "flake-file" - ], - "flake-parts": [ - "checkmate", - "flake-parts" - ], - "import-tree": [ - "checkmate", - "import-tree" - ], - "nix-unit": [ - "checkmate", - "nix-unit" - ], - "nixpkgs": [ - "checkmate", - "nixpkgs" - ], - "nixpkgs-lib": [ - "checkmate", - "nixpkgs" - ], - "systems": [ - "checkmate", - "systems" - ], - "target": [ - "checkmate", - "target" - ], - "treefmt-nix": [ - "checkmate", - "treefmt-nix" - ] - }, - "locked": { - "lastModified": 1763693729, - "narHash": "sha256-AWXVFz1VVHJXEFrAaiMO52o495Zkg4fgSNliXjO5odQ=", - "owner": "vic", - "repo": "checkmate", - "rev": "b196737de43e57d96652aaf4cb4ad94569f8fea0", - "type": "github" - }, - "original": { - "owner": "vic", - "repo": "checkmate", - "type": "github" - } - }, - "checkmate_3": { - "inputs": { - "den": [ - "checkmate", - "checkmate", - "den" - ], - "flake-aspects": [ - "checkmate", - "checkmate", - "flake-aspects" - ], - "flake-file": [ - "checkmate", - "checkmate", - "flake-file" - ], - "flake-parts": [ - "checkmate", - "checkmate", - "flake-parts" - ], - "import-tree": [ - "checkmate", - "checkmate", - "import-tree" - ], - "nix-unit": [ - "checkmate", - "checkmate", - "nix-unit" - ], - "nixpkgs": [ - "checkmate", - "checkmate", - "nixpkgs" - ], - "nixpkgs-lib": [ - "checkmate", - "checkmate", - "nixpkgs" - ], - "systems": [ - "checkmate", - "checkmate", - "systems" - ], - "target": [ - "checkmate", - "checkmate", - "target" - ], - "treefmt-nix": [ - "checkmate", - "checkmate", - "treefmt-nix" - ] - }, - "locked": { - "lastModified": 1763688964, - "narHash": "sha256-xJ3g37BgPgIKNrUT9wo/QCDXpo5P/KZA3wjT9ETmc8o=", - "owner": "vic", - "repo": "checkmate", - "rev": "7add32917422eb14bf09560f9686d19232745ae1", - "type": "github" - }, - "original": { - "owner": "vic", - "repo": "checkmate", - "type": "github" - } - }, "den": { "locked": { "lastModified": 1763683549, @@ -329,7 +144,6 @@ }, "root": { "inputs": { - "checkmate": "checkmate", "den": "den", "flake-aspects": "flake-aspects", "flake-file": "flake-file", diff --git a/flake.nix b/flake.nix index d04a9b6..2307783 100644 --- a/flake.nix +++ b/flake.nix @@ -5,22 +5,6 @@ outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } (inputs.import-tree ./modules); inputs = { - checkmate = { - inputs = { - den.follows = "den"; - flake-aspects.follows = "flake-aspects"; - flake-file.follows = "flake-file"; - flake-parts.follows = "flake-parts"; - import-tree.follows = "import-tree"; - nix-unit.follows = "nix-unit"; - nixpkgs.follows = "nixpkgs"; - nixpkgs-lib.follows = "nixpkgs"; - systems.follows = "systems"; - target.follows = "target"; - treefmt-nix.follows = "treefmt-nix"; - }; - url = "github:vic/checkmate"; - }; den.url = "github:vic/den"; flake-aspects.url = "github:vic/flake-aspects"; flake-file.url = "github:vic/flake-file"; diff --git a/modules/checkmate/checkmate.nix b/modules/checkmate/checkmate.nix deleted file mode 100644 index ee3a4e6..0000000 --- a/modules/checkmate/checkmate.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, ... }: -{ - flake-file.inputs.checkmate = { - url = lib.mkDefault "github:vic/checkmate"; - inputs = { - den.follows = "den"; - flake-aspects.follows = "flake-aspects"; - flake-file.follows = "flake-file"; - flake-parts.follows = "flake-parts"; - import-tree.follows = "import-tree"; - nix-unit.follows = "nix-unit"; - nixpkgs.follows = "nixpkgs"; - nixpkgs-lib.follows = "nixpkgs"; - systems.follows = "systems"; - target.follows = "target"; - treefmt-nix.follows = "treefmt-nix"; - }; - }; -} diff --git a/modules/flakeModule.nix b/modules/flakeModule.nix index 027dc3a..6b6e8a9 100644 --- a/modules/flakeModule.nix +++ b/modules/flakeModule.nix @@ -2,10 +2,27 @@ flake.flakeModule = { inputs, lib, ... }: { + imports = [ (inputs.flake-file.flakeModules.dendritic or { }) (inputs.import-tree ./checkmate) ]; - flake-file.inputs.checkmate.url = lib.mkDefault "github:vic/checkmate"; + + flake-file.inputs.checkmate = { + url = lib.mkDefault "github:vic/checkmate"; + inputs = { + den.follows = "den"; + flake-aspects.follows = "flake-aspects"; + flake-file.follows = "flake-file"; + flake-parts.follows = "flake-parts"; + import-tree.follows = "import-tree"; + nix-unit.follows = "nix-unit"; + nixpkgs.follows = "nixpkgs"; + nixpkgs-lib.follows = "nixpkgs"; + systems.follows = "systems"; + target.follows = "target"; + treefmt-nix.follows = "treefmt-nix"; + }; + }; }; } diff --git a/templates/dendritic/checkmate/flake.lock b/templates/dendritic/checkmate/flake.lock index ee9bd87..858fab2 100644 --- a/templates/dendritic/checkmate/flake.lock +++ b/templates/dendritic/checkmate/flake.lock @@ -37,6 +37,68 @@ "treefmt-nix" ] }, + "locked": { + "lastModified": 1763694529, + "narHash": "sha256-J4jP3+mYieIhkZ058Nc8knaI4GpKQCOh/0CtzIjl75g=", + "owner": "vic", + "repo": "checkmate", + "rev": "45722f14619067e6ae10c2b75b917715f0eb970d", + "type": "github" + }, + "original": { + "owner": "vic", + "repo": "checkmate", + "type": "github" + } + }, + "checkmate_2": { + "inputs": { + "checkmate": "checkmate_3", + "den": [ + "checkmate", + "den" + ], + "flake-aspects": [ + "checkmate", + "flake-aspects" + ], + "flake-file": [ + "checkmate", + "flake-file" + ], + "flake-parts": [ + "checkmate", + "flake-parts" + ], + "import-tree": [ + "checkmate", + "import-tree" + ], + "nix-unit": [ + "checkmate", + "nix-unit" + ], + "nixpkgs": [ + "checkmate", + "nixpkgs" + ], + "nixpkgs-lib": [ + "checkmate", + "nixpkgs" + ], + "systems": [ + "checkmate", + "systems" + ], + "target": [ + "checkmate", + "target" + ], + "treefmt-nix": [ + "checkmate", + "treefmt-nix" + ] + }, "locked": { "lastModified": 1763694353, "narHash": "sha256-W5U42yzaKukUDDggnq1gaVo8dATcuDoj5kVt7cqFD6E=", @@ -51,50 +113,61 @@ "type": "github" } }, - "checkmate_2": { + "checkmate_3": { "inputs": { - "checkmate": "checkmate_3", + "checkmate": "checkmate_4", "den": [ + "checkmate", "checkmate", "den" ], "flake-aspects": [ + "checkmate", "checkmate", "flake-aspects" ], "flake-file": [ + "checkmate", "checkmate", "flake-file" ], "flake-parts": [ + "checkmate", "checkmate", "flake-parts" ], "import-tree": [ + "checkmate", "checkmate", "import-tree" ], "nix-unit": [ + "checkmate", "checkmate", "nix-unit" ], "nixpkgs": [ + "checkmate", "checkmate", "nixpkgs" ], "nixpkgs-lib": [ + "checkmate", "checkmate", "nixpkgs" ], "systems": [ + "checkmate", "checkmate", "systems" ], "target": [ + "checkmate", "checkmate", "target" ], "treefmt-nix": [ + "checkmate", "checkmate", "treefmt-nix" ] @@ -113,59 +186,70 @@ "type": "github" } }, - "checkmate_3": { + "checkmate_4": { "inputs": { "den": [ + "checkmate", "checkmate", "checkmate", "den" ], "flake-aspects": [ + "checkmate", "checkmate", "checkmate", "flake-aspects" ], "flake-file": [ + "checkmate", "checkmate", "checkmate", "flake-file" ], "flake-parts": [ + "checkmate", "checkmate", "checkmate", "flake-parts" ], "import-tree": [ + "checkmate", "checkmate", "checkmate", "import-tree" ], "nix-unit": [ + "checkmate", "checkmate", "checkmate", "nix-unit" ], "nixpkgs": [ + "checkmate", "checkmate", "checkmate", "nixpkgs" ], "nixpkgs-lib": [ + "checkmate", "checkmate", "checkmate", "nixpkgs" ], "systems": [ + "checkmate", "checkmate", "checkmate", "systems" ], "target": [ + "checkmate", "checkmate", "checkmate", "target" ], "treefmt-nix": [ + "checkmate", "checkmate", "checkmate", "treefmt-nix" @@ -252,11 +336,11 @@ }, "import-tree": { "locked": { - "lastModified": 1763673815, - "narHash": "sha256-vlkLsqaTqSVuIKA9xLPGmemXNekU3OVhpXs5HF1Nv14=", + "lastModified": 1763695721, + "narHash": "sha256-tMfN/JkwWJ129cXDW+lK2gUcjklJ+LpTHj9LlneJRXg=", "owner": "vic", "repo": "import-tree", - "rev": "6cef16391ec216f50847a5923100ee5ebc709c00", + "rev": "ca69d64711265c68cf71f6c029ab9f1a55a767f8", "type": "github" }, "original": { @@ -363,11 +447,11 @@ "target": { "locked": { "dir": "templates/dendritic", - "lastModified": 1763694353, - "narHash": "sha256-W5U42yzaKukUDDggnq1gaVo8dATcuDoj5kVt7cqFD6E=", + "lastModified": 1763694529, + "narHash": "sha256-J4jP3+mYieIhkZ058Nc8knaI4GpKQCOh/0CtzIjl75g=", "owner": "vic", "repo": "checkmate", - "rev": "f2bbf487cb5e730f357faef65ecb73fa12a568b5", + "rev": "45722f14619067e6ae10c2b75b917715f0eb970d", "type": "github" }, "original": {