Loading pkgs/by-name/ba/bao/package.nix +3 −8 Original line number Diff line number Diff line Loading @@ -6,21 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "bao"; version = "0.12.1"; version = "0.13.0"; src = fetchCrate { inherit version; pname = "${pname}_bin"; hash = "sha256-+MjfqIg/aKPWhzxbPJ0dnS4egCj50Ib7ob3zXUSBXRg="; hash = "sha256-MpMNhL1n8dNJJcJJiDXv/qWUgCNqQIvvcR8veH+abuI="; }; cargoPatches = [ # https://github.com/oconnor663/bao/pull/55 ./test-exe.patch ]; useFetchCargoVendor = true; cargoHash = "sha256-gJj+4NAtvSpAlX3q2GEQh1CgqKhw5vd6huPrV8NRsiE="; cargoHash = "sha256-Vw8T/pgGMjI8QklkQNuZSYmKcKhaR320q8ZBAT4HPZ8="; meta = { description = "Implementation of BLAKE3 verified streaming"; Loading pkgs/by-name/ba/bao/test-exe.patchdeleted 100644 → 0 +0 −40 Original line number Diff line number Diff line diff --git a/Cargo.toml b/Cargo.toml index 2f66e42..34240e8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,6 +26,9 @@ path = "src/main.rs" [dependencies.arrayref] version = "0.3.5" +[dependencies.assert_cmd] +version = "2.0.16" + [dependencies.bao] version = "0.12" diff --git a/tests/test.rs b/tests/test.rs index f9427bd..48aabca 100644 --- a/tests/test.rs +++ b/tests/test.rs @@ -1,8 +1,7 @@ use duct::cmd; use rand::prelude::*; -use std::env::consts::EXE_EXTENSION; use std::fs; -use std::path::{Path, PathBuf}; +use std::path::PathBuf; use std::sync::Once; use tempfile::tempdir; @@ -15,10 +14,7 @@ pub fn bao_exe() -> PathBuf { .expect("build failed"); }); - Path::new("target") - .join("debug") - .join("bao") - .with_extension(EXE_EXTENSION) + assert_cmd::cargo::cargo_bin("bao") } #[test] Loading
pkgs/by-name/ba/bao/package.nix +3 −8 Original line number Diff line number Diff line Loading @@ -6,21 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "bao"; version = "0.12.1"; version = "0.13.0"; src = fetchCrate { inherit version; pname = "${pname}_bin"; hash = "sha256-+MjfqIg/aKPWhzxbPJ0dnS4egCj50Ib7ob3zXUSBXRg="; hash = "sha256-MpMNhL1n8dNJJcJJiDXv/qWUgCNqQIvvcR8veH+abuI="; }; cargoPatches = [ # https://github.com/oconnor663/bao/pull/55 ./test-exe.patch ]; useFetchCargoVendor = true; cargoHash = "sha256-gJj+4NAtvSpAlX3q2GEQh1CgqKhw5vd6huPrV8NRsiE="; cargoHash = "sha256-Vw8T/pgGMjI8QklkQNuZSYmKcKhaR320q8ZBAT4HPZ8="; meta = { description = "Implementation of BLAKE3 verified streaming"; Loading
pkgs/by-name/ba/bao/test-exe.patchdeleted 100644 → 0 +0 −40 Original line number Diff line number Diff line diff --git a/Cargo.toml b/Cargo.toml index 2f66e42..34240e8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,6 +26,9 @@ path = "src/main.rs" [dependencies.arrayref] version = "0.3.5" +[dependencies.assert_cmd] +version = "2.0.16" + [dependencies.bao] version = "0.12" diff --git a/tests/test.rs b/tests/test.rs index f9427bd..48aabca 100644 --- a/tests/test.rs +++ b/tests/test.rs @@ -1,8 +1,7 @@ use duct::cmd; use rand::prelude::*; -use std::env::consts::EXE_EXTENSION; use std::fs; -use std::path::{Path, PathBuf}; +use std::path::PathBuf; use std::sync::Once; use tempfile::tempdir; @@ -15,10 +14,7 @@ pub fn bao_exe() -> PathBuf { .expect("build failed"); }); - Path::new("target") - .join("debug") - .join("bao") - .with_extension(EXE_EXTENSION) + assert_cmd::cargo::cargo_bin("bao") } #[test]