Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a907b64a1b |
3 changed files with 26 additions and 43 deletions
1
.envrc
1
.envrc
|
|
@ -1 +0,0 @@
|
|||
use flake
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -6,4 +6,3 @@ dist/
|
|||
*.tgz
|
||||
wasm/pkg/
|
||||
web_client/
|
||||
.direnv
|
||||
|
|
|
|||
67
flake.nix
67
flake.nix
|
|
@ -5,30 +5,26 @@
|
|||
rust-overlay.url = "github:oxalica/rust-overlay";
|
||||
};
|
||||
|
||||
outputs =
|
||||
{
|
||||
self,
|
||||
nixpkgs,
|
||||
rust-overlay,
|
||||
}:
|
||||
let
|
||||
systems = [
|
||||
"aarch64-darwin"
|
||||
"aarch64-linux"
|
||||
"x86_64-darwin"
|
||||
"x86_64-linux"
|
||||
];
|
||||
eachSystem =
|
||||
f:
|
||||
nixpkgs.lib.foldl' nixpkgs.lib.recursiveUpdate { } (
|
||||
map (system: nixpkgs.lib.mapAttrs (_: value: { ${system} = value; }) (f system)) systems
|
||||
);
|
||||
in
|
||||
outputs = {
|
||||
self,
|
||||
nixpkgs,
|
||||
rust-overlay,
|
||||
}: let
|
||||
systems = [
|
||||
"aarch64-darwin"
|
||||
"aarch64-linux"
|
||||
"x86_64-darwin"
|
||||
"x86_64-linux"
|
||||
];
|
||||
eachSystem = f:
|
||||
nixpkgs.lib.foldl' nixpkgs.lib.recursiveUpdate {} (
|
||||
map (system: nixpkgs.lib.mapAttrs (_: value: {${system} = value;}) (f system)) systems
|
||||
);
|
||||
in
|
||||
eachSystem (
|
||||
system:
|
||||
let
|
||||
overlays = [ rust-overlay.overlays.default ];
|
||||
pkgs = import nixpkgs { inherit system overlays; };
|
||||
system: let
|
||||
overlays = [rust-overlay.overlays.default];
|
||||
pkgs = import nixpkgs {inherit system overlays;};
|
||||
|
||||
rustToolchain = pkgs.rust-bin.stable.latest.default.override {
|
||||
extensions = [
|
||||
|
|
@ -36,12 +32,12 @@
|
|||
"clippy"
|
||||
"rustfmt"
|
||||
];
|
||||
targets = [ "wasm32-unknown-unknown" ];
|
||||
targets = ["wasm32-unknown-unknown"];
|
||||
};
|
||||
|
||||
clippyCheck = pkgs.writeShellApplication {
|
||||
name = "mtp-clippy";
|
||||
runtimeInputs = [ rustToolchain ];
|
||||
runtimeInputs = [rustToolchain];
|
||||
text = ''
|
||||
export MTP_TYPE_MAPS="''${MTP_TYPE_MAPS:-$PWD/example/type-maps.yaml}"
|
||||
cargo clippy --workspace --exclude mtp-wasm --all-targets --all-features -- -D warnings -W unreachable-pub
|
||||
|
|
@ -50,7 +46,7 @@
|
|||
|
||||
macheteCheck = pkgs.writeShellApplication {
|
||||
name = "mtp-machete";
|
||||
runtimeInputs = [ pkgs.cargo-machete ];
|
||||
runtimeInputs = [pkgs.cargo-machete];
|
||||
text = ''
|
||||
cargo machete "$@"
|
||||
'';
|
||||
|
|
@ -58,15 +54,7 @@
|
|||
|
||||
buildAll = pkgs.writeShellApplication {
|
||||
name = "mtp-build-all";
|
||||
runtimeInputs = [
|
||||
rustToolchain
|
||||
pkgs.cargo-deny
|
||||
pkgs.wasm-pack
|
||||
pkgs.pnpm
|
||||
pkgs.coreutils
|
||||
clippyCheck
|
||||
macheteCheck
|
||||
];
|
||||
runtimeInputs = [rustToolchain pkgs.cargo-deny pkgs.wasm-pack pkgs.pnpm pkgs.coreutils clippyCheck macheteCheck];
|
||||
text = ''
|
||||
export MTP_TYPE_MAPS="''${MTP_TYPE_MAPS:-$PWD/example/type-maps.yaml}"
|
||||
|
||||
|
|
@ -78,6 +66,7 @@
|
|||
cargo check --manifest-path example/Cargo.toml --workspace --all-targets --all-features
|
||||
mtp-clippy
|
||||
mtp-machete
|
||||
pnpm run dup
|
||||
pnpm run build
|
||||
RUSTFLAGS="--cfg web_sys_unstable_apis" wasm-pack test --node wasm
|
||||
pnpm run test:e2e
|
||||
|
|
@ -90,17 +79,13 @@
|
|||
|
||||
healthCheck = pkgs.writeShellApplication {
|
||||
name = "mtp-health";
|
||||
runtimeInputs = [
|
||||
clippyCheck
|
||||
macheteCheck
|
||||
];
|
||||
runtimeInputs = [clippyCheck macheteCheck];
|
||||
text = ''
|
||||
mtp-clippy
|
||||
mtp-machete
|
||||
'';
|
||||
};
|
||||
in
|
||||
{
|
||||
in {
|
||||
devShells = {
|
||||
default = pkgs.mkShell {
|
||||
name = "mtp-dev";
|
||||
|
|
|
|||
Loading…
Reference in a new issue