From 2b5f20c4f4ad0ed134c35400c88b8b6f14ea3dc1 Mon Sep 17 00:00:00 2001 From: Qubasa Date: Sat, 28 Jun 2025 22:42:20 +0700 Subject: [PATCH] Revert "templates/minimal: consistent input names" This reverts commit 8ab9556a12243f1209b13ee46faf9fff8a4ac3e7. --- pkgs/clan-cli/clan_cli/tests/test_create_flake.py | 6 +++--- templates/clan/minimal/flake.nix | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/tests/test_create_flake.py b/pkgs/clan-cli/clan_cli/tests/test_create_flake.py index 434574e3a..eb8aaa45c 100644 --- a/pkgs/clan-cli/clan_cli/tests/test_create_flake.py +++ b/pkgs/clan-cli/clan_cli/tests/test_create_flake.py @@ -24,7 +24,7 @@ def test_create_flake( cli.run(["flakes", "create", str(flake_dir), "--template=default", "--no-update"]) 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( flake_dir / "flake.nix", clan_core, @@ -69,7 +69,7 @@ def test_create_flake_existing_git( cli.run(["flakes", "create", str(flake_dir), "--template=default", "--no-update"]) 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( flake_dir / "flake.nix", clan_core, @@ -111,7 +111,7 @@ def test_ui_template( 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( flake_dir / "flake.nix", clan_core, diff --git a/templates/clan/minimal/flake.nix b/templates/clan/minimal/flake.nix index 1ad231997..a299343fd 100644 --- a/templates/clan/minimal/flake.nix +++ b/templates/clan/minimal/flake.nix @@ -1,10 +1,11 @@ { + inputs = { - clan-core.url = "https://git.clan.lol/clan/clan-core/archive/main.tar.gz"; - nixpkgs.follows = "clan-core/nixpkgs"; + 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-core/nixpkgs"; + flake-parts.inputs.nixpkgs-lib.follows = "clan/nixpkgs"; }; outputs = @@ -14,7 +15,7 @@ { imports = [ - inputs.clan-core.flakeModules.default + inputs.clan.flakeModules.default ]; clan = {