From 8117fa732b4a4cd5e830d021e523c63725afcda3 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sun, 21 Jan 2024 17:16:51 -0500 Subject: [PATCH 1/2] nix: fix build --- build.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.nix b/build.nix index a37a6c6e..a7383d1b 100644 --- a/build.nix +++ b/build.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation { udev ] ++ lib.optional fuseSupport fuse3; - BCACHEFS_FUSE = if fuseSupport then "1" else ""; + ${if fuseSupport then "BCACHEFS_FUSE" else null} = "1"; cargoRoot = "."; # when git-based crates are updated, run: @@ -49,7 +49,7 @@ in stdenv.mkDerivation { makeFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" "VERSION=${commit}" ]; dontStrip = true; - checkPhase = "./bcachefs version"; + checkPhase = "./target/release/bcachefs version"; doCheck = true; meta = { From de191cd19cadf47a0e9d71da0b3cef72bcff25ae Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Sun, 21 Jan 2024 17:16:58 -0500 Subject: [PATCH 2/2] rust: fix docs --- src/commands/cmd_mount.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commands/cmd_mount.rs b/src/commands/cmd_mount.rs index c644767e..c845172d 100644 --- a/src/commands/cmd_mount.rs +++ b/src/commands/cmd_mount.rs @@ -137,7 +137,7 @@ pub struct Cli { #[arg(short, long, default_value = "ask", verbatim_doc_comment)] key_location: KeyLocation, - /// Device, or UUID= + /// Device, or UUID=\ dev: String, /// Where the filesystem should be mounted. If not set, then the filesystem