From 4296ef92a93d7b804d5bd62a732db0fd4a4061e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 8 Aug 2023 14:11:04 +0200 Subject: [PATCH] rename clan to clan-cli It's already confusing enough to have so many things called clan-cli --- pkgs/clan-cli/.envrc | 2 +- pkgs/clan-cli/flake-module.nix | 10 +++++----- pkgs/clan-cli/shell.nix | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/clan-cli/.envrc b/pkgs/clan-cli/.envrc index 359803c6..00f84d52 100644 --- a/pkgs/clan-cli/.envrc +++ b/pkgs/clan-cli/.envrc @@ -7,4 +7,4 @@ if type nix_direnv_watch_file &>/dev/null; then else direnv watch flake-module.nix fi -use flake .#clan --builders '' +use flake .#clan-cli --builders '' diff --git a/pkgs/clan-cli/flake-module.nix b/pkgs/clan-cli/flake-module.nix index dc603fbb..4a037034 100644 --- a/pkgs/clan-cli/flake-module.nix +++ b/pkgs/clan-cli/flake-module.nix @@ -1,15 +1,15 @@ { self, ... }: { perSystem = { self', pkgs, ... }: { - devShells.clan = pkgs.callPackage ./shell.nix { + devShells.clan-cli = pkgs.callPackage ./shell.nix { inherit self; - inherit (self'.packages) clan; + inherit (self'.packages) clan-cli; }; packages = { - clan = pkgs.python3.pkgs.callPackage ./default.nix { + clan-cli = pkgs.python3.pkgs.callPackage ./default.nix { inherit self; zerotierone = self'.packages.zerotierone; }; - default = self'.packages.clan; + default = self'.packages.clan-cli; ## Optional dependencies for clan cli, we re-expose them here to make sure they all build. inherit (pkgs) @@ -27,7 +27,7 @@ ## End optional dependencies }; - checks = self'.packages.clan.tests // { + checks = self'.packages.clan-cli.tests // { # check if the `clan config` example jsonschema and data is valid clan-config-example-schema-valid = pkgs.runCommand "clan-config-example-schema-valid" { } '' echo "Checking that example-schema.json is valid" diff --git a/pkgs/clan-cli/shell.nix b/pkgs/clan-cli/shell.nix index d3c658e8..cc6490a7 100644 --- a/pkgs/clan-cli/shell.nix +++ b/pkgs/clan-cli/shell.nix @@ -1,9 +1,9 @@ -{ self, clan, pkgs }: +{ self, clan-cli, pkgs }: let pythonWithDeps = pkgs.python3.withPackages ( ps: - clan.propagatedBuildInputs - ++ clan.devDependencies + clan-cli.propagatedBuildInputs + ++ clan-cli.devDependencies ++ [ ps.pip ]