yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "templates/minimal: consistent input names"

Browse Source 
This reverts commit 8ab9556a12.
This commit is contained in:
Qubasa
2025-06-28 22:42:20 +07:00
parent 1be70856d5
commit 2b5f20c4f4
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/clan-cli/clan_cli/tests/test_create_flake.py
View File

@@ -24,7 +24,7 @@ def test_create_flake(
cli.run(["flakes", "create", str(flake_dir), "--template=default", "--no-update"]) cli.run(["flakes", "create", str(flake_dir), "--template=default", "--no-update"])
assert (flake_dir / ".clan-flake").exists() assert (flake_dir / ".clan-flake").exists()
# Replace the inputs.clan-core.url in the template flake.nix # Replace the inputs.clan.url in the template flake.nix
substitute( substitute(
flake_dir / "flake.nix", flake_dir / "flake.nix",
clan_core, clan_core,
@@ -69,7 +69,7 @@ def test_create_flake_existing_git(
cli.run(["flakes", "create", str(flake_dir), "--template=default", "--no-update"]) cli.run(["flakes", "create", str(flake_dir), "--template=default", "--no-update"])
assert (flake_dir / ".clan-flake").exists() assert (flake_dir / ".clan-flake").exists()
# Replace the inputs.clan-core.url in the template flake.nix # Replace the inputs.clan.url in the template flake.nix
substitute( substitute(
flake_dir / "flake.nix", flake_dir / "flake.nix",
clan_core, clan_core,
@@ -111,7 +111,7 @@ def test_ui_template(
cli.run(["flakes", "create", str(flake_dir), "--template=minimal", "--no-update"]) cli.run(["flakes", "create", str(flake_dir), "--template=minimal", "--no-update"])
# Replace the inputs.clan-core.url in the template flake.nix # Replace the inputs.clan.url in the template flake.nix
substitute( substitute(
flake_dir / "flake.nix", flake_dir / "flake.nix",
clan_core, clan_core,

9
templates/clan/minimal/flake.nix
View File

@@ -1,10 +1,11 @@
{ {
inputs = { inputs = {
clan-core.url = "https://git.clan.lol/clan/clan-core/archive/main.tar.gz"; clan.url = "https://git.clan.lol/clan/clan-core/archive/main.tar.gz";
nixpkgs.follows = "clan-core/nixpkgs"; nixpkgs.follows = "clan/nixpkgs";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
flake-parts.inputs.nixpkgs-lib.follows = "clan-core/nixpkgs"; flake-parts.inputs.nixpkgs-lib.follows = "clan/nixpkgs";
}; };
outputs = outputs =
@@ -14,7 +15,7 @@
{ {
imports = [ imports = [
inputs.clan-core.flakeModules.default inputs.clan.flakeModules.default
]; ];
clan = { clan = {