From 095bc3bc8c1155442256878c2a148fe24a1fecf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Mon, 30 Sep 2024 16:47:28 +0200 Subject: [PATCH] fix(default.nix): small issues here and there Mostly concerning the test output --- default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/default.nix b/default.nix index a3b6c80..19889c4 100644 --- a/default.nix +++ b/default.nix @@ -1,7 +1,4 @@ -{ - lib, - rustPlatform, -}: +{ lib, rustPlatform }: let readToml = path: builtins.fromTOML (builtins.readFile path); cargoToml = readToml ./Cargo.toml; @@ -17,7 +14,6 @@ let let path = toString orig_path; base = baseNameOf path; - parentDir = baseNameOf (dirOf path); matchesSuffix = lib.any (suffix: lib.hasSuffix suffix base) [ # Rust sources ".rs" @@ -25,16 +21,16 @@ let ".toml" ]; isCargoLock = base == "Cargo.lock"; - # .cargo/config.toml is captured above - isOldStyleCargoConfig = parentDir == ".cargo" && base == "config"; in - type == "directory" || matchesSuffix || isCargoLock || isOldStyleCargoConfig; + type == "directory" || matchesSuffix || isCargoLock; }; in rustPlatform.buildRustPackage { inherit pname version src; cargoLock.lockFile = ./Cargo.lock; useNextest = true; + NEXTEST_HIDE_PROGRESS_BAR = 1; + NEXTEST_FAILURE_OUTPUT = "immediate-final"; meta = { inherit description;