harald/teepot
1
0
Fork 0
mirror of https://github.com/matter-labs/teepot.git synced 2025-07-21 23:23:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore(nix): replace nix-filter with lib.fileset

Browse source 
Signed-off-by: Harald Hoyer <harald@matterlabs.dev>
This commit is contained in:
Harald Hoyer 2024-02-15 11:18:07 +01:00
parent 5a0bddf850
commit bf2e4a1b8e
Signed by: harald
GPG key ID: F519A1143B3FBE32
2 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
flake.nix
View file

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

21
packages/teepot/default.nix
View file

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