diff options
Diffstat (limited to 'parts')
| -rw-r--r-- | parts/default.nix | 7 | ||||
| -rw-r--r-- | parts/dev.nix | 9 | ||||
| -rw-r--r-- | parts/packages.nix | 5 |
3 files changed, 6 insertions, 15 deletions
diff --git a/parts/default.nix b/parts/default.nix index ecace0f..0f093f8 100644 --- a/parts/default.nix +++ b/parts/default.nix @@ -12,11 +12,4 @@ _: { "aarch64-linux" "aarch64-darwin" ]; - - perSystem = _: { - _module.args.src = builtins.path { - name = "teawiebot-src"; - path = ../.; - }; - }; } diff --git a/parts/dev.nix b/parts/dev.nix index 65fcfd0..246789a 100644 --- a/parts/dev.nix +++ b/parts/dev.nix @@ -7,15 +7,14 @@ craneLib, pkgs, system, - src, toolchain, ... - } @ args: { + }: { checks = let - inherit (craneLib) cargoAudit cargoClippy cleanCargoSource cargoFmt path; + inherit (craneLib) cargoAudit cargoClippy cleanCargoSource cargoFmt; commonArgs = { - src = cleanCargoSource (path args.src); + src = cleanCargoSource self; }; in { inherit (self.packages.${system}) teawiebot; @@ -31,7 +30,7 @@ fmt = cargoFmt commonArgs; pre-commit-check = inputs.pre-commit-hooks.lib.${system}.run { - inherit src; + src = self; hooks = { actionlint.enable = true; alejandra.enable = true; diff --git a/parts/packages.nix b/parts/packages.nix index 1b8acd8..f44ac50 100644 --- a/parts/packages.nix +++ b/parts/packages.nix @@ -2,7 +2,6 @@ perSystem = { craneLib, pkgs, - src, system, ... }: let @@ -10,10 +9,10 @@ inherit (craneLib) buildPackage; in { packages = { - cargoArtifacts = craneLib.buildDepsOnly {inherit src;}; + cargoArtifacts = craneLib.buildDepsOnly {src = self;}; teawiebot = buildPackage { - inherit src; + src = self; inherit (self.packages.${system}) cargoArtifacts; meta = { |