Merge pull request #22 from matter-labs/nix-filter

chore(nix): replace nix-filter with `lib.fileset`
This commit is contained in:
Harald Hoyer 2024-02-15 18:25:58 +01:00 committed by GitHub
commit a49e8f7f34
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 14 deletions

View file

@ -18,8 +18,6 @@
url = "github:oxalica/rust-overlay?rev=3ad32bb27c700b59306224e285b66577e3532dfc";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-filter.url = "github:numtide/nix-filter?rev=3449dc925982ad46246cfc36469baf66e1b64f17";
};
outputs = inputs:
@ -32,7 +30,6 @@
overlays = with inputs; [
nixsgx-flake.overlays.default
rust-overlay.overlays.default
nix-filter.overlays.default
];
alias = {

View file

@ -1,7 +1,6 @@
{ lib
, gccStdenv
, makeRustPlatform
, nix-filter
, nixsgx
, pkg-config
, rust-bin
@ -30,17 +29,17 @@ rustPlatform.buildRustPackage {
nixsgx.sgx-dcap.quote_verify
];
src = nix-filter {
src = with lib.fileset; toSource {
root = ./../..;
include = [
"Cargo.lock"
"Cargo.toml"
"assets"
"bin"
"crates"
"rust-toolchain.toml"
"src"
"tests"
fileset = unions [
../../Cargo.lock
../../Cargo.toml
../../assets
../../bin
../../crates
../../rust-toolchain.toml
../../src
../../tests
];
};
RUSTFLAGS = "--cfg mio_unsupported_force_waker_pipe";