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

Merge pull request 'rename clan to clan-cli' (#97) from Mic92-mic92 into main

Browse Source
This commit is contained in:
clan-bot
2023-08-08 12:18:54 +00:00
parent 6934b0a056 4296ef92a9
commit 1ca04c2829
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/clan-cli/.envrc
View File

@@ -7,4 +7,4 @@ if type nix_direnv_watch_file &>/dev/null; then
else else
direnv watch flake-module.nix direnv watch flake-module.nix
fi fi
use flake .#clan --builders '' use flake .#clan-cli --builders ''

10
pkgs/clan-cli/flake-module.nix
View File

@@ -1,15 +1,15 @@
{ self, ... }: { { self, ... }: {
perSystem = { self', pkgs, ... }: { perSystem = { self', pkgs, ... }: {
devShells.clan = pkgs.callPackage ./shell.nix { devShells.clan-cli = pkgs.callPackage ./shell.nix {
inherit self; inherit self;
inherit (self'.packages) clan; inherit (self'.packages) clan-cli;
}; };
packages = { packages = {
clan = pkgs.python3.pkgs.callPackage ./default.nix { clan-cli = pkgs.python3.pkgs.callPackage ./default.nix {
inherit self; inherit self;
zerotierone = self'.packages.zerotierone; 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. ## Optional dependencies for clan cli, we re-expose them here to make sure they all build.
inherit (pkgs) inherit (pkgs)
@@ -27,7 +27,7 @@
## End optional dependencies ## 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 # check if the `clan config` example jsonschema and data is valid
clan-config-example-schema-valid = pkgs.runCommand "clan-config-example-schema-valid" { } '' clan-config-example-schema-valid = pkgs.runCommand "clan-config-example-schema-valid" { } ''
echo "Checking that example-schema.json is valid" echo "Checking that example-schema.json is valid"

6
pkgs/clan-cli/shell.nix
View File

@@ -1,9 +1,9 @@
{ self, clan, pkgs }: { self, clan-cli, pkgs }:
let let
pythonWithDeps = pkgs.python3.withPackages ( pythonWithDeps = pkgs.python3.withPackages (
ps: ps:
clan.propagatedBuildInputs clan-cli.propagatedBuildInputs
++ clan.devDependencies ++ clan-cli.devDependencies
++ [ ++ [
ps.pip ps.pip
] ]