Merge pull request 'rename clan to clan-cli' (#97) from Mic92-mic92 into main
All checks were successful
build / test (push) Successful in 15s

This commit is contained in:
clan-bot 2023-08-08 12:18:54 +00:00
commit 1ca04c2829
3 changed files with 9 additions and 9 deletions

View File

@ -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 ''

View File

@ -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"

View File

@ -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
]