Update templates
parent
07c88e6486
commit
76c0b03e49
|
@ -1,4 +1,7 @@
|
|||
{
|
||||
let
|
||||
mkTemplates = builtins.mapAttrs (name: attrs: attrs // { path = ./. + "/${name}"; });
|
||||
in
|
||||
mkTemplates {
|
||||
rust = {
|
||||
description = "A rust flake template based on flake.parts";
|
||||
welcomeText = ''
|
||||
|
@ -6,6 +9,5 @@
|
|||
|
||||
run `direnv allow` and `cargo init` to start a new project
|
||||
'';
|
||||
path = ./templates/rust;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -10,8 +10,8 @@
|
|||
pre-commit.inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
outputs = { self, flake-parts, crane, pre-commit, ... }:
|
||||
flake-parts.lib.mkFlake { inherit self; } {
|
||||
outputs = inputs@{ self, flake-parts, crane, pre-commit, ... }:
|
||||
flake-parts.lib.mkFlake { inherit inputs; } {
|
||||
imports = [ pre-commit.flakeModule ];
|
||||
systems = [
|
||||
"aarch64-darwin"
|
||||
|
@ -24,7 +24,7 @@
|
|||
crane-lib = crane.lib.${system};
|
||||
package = crane-lib.buildPackage {
|
||||
src = crane-lib.cleanCargoSource ./.;
|
||||
nativeBuildInputs = [ pkgs.libiconv ];
|
||||
nativeBuildInputs = pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ];
|
||||
};
|
||||
in
|
||||
{
|
||||
|
@ -43,15 +43,19 @@
|
|||
inputsFrom = builtins.attrValues self.checks;
|
||||
|
||||
RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";
|
||||
nativeBuildInputs = with pkgs; [
|
||||
cargo
|
||||
rustc
|
||||
];
|
||||
buildInputs = with pkgs; [
|
||||
rust-analyzer
|
||||
rustfmt
|
||||
clippy
|
||||
];
|
||||
nativeBuildInputs = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
cargo
|
||||
rustc
|
||||
;
|
||||
};
|
||||
buildInputs = builtins.attrValues {
|
||||
inherit (pkgs)
|
||||
rust-analyzer
|
||||
rustfmt
|
||||
clippy
|
||||
;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue