diff --git a/flake.lock b/flake.lock index a983c0a..6f12930 100644 --- a/flake.lock +++ b/flake.lock @@ -33,11 +33,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728241625, - "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -63,11 +63,11 @@ ] }, "locked": { - "lastModified": 1728354625, - "narHash": "sha256-r+Sa1NRRT7LXKzCaVaq75l1GdZcegODtF06uaxVVVbI=", + "lastModified": 1728613723, + "narHash": "sha256-zVVj0PKguM8ZMdLE43YW7dzer3tl9e6i5Qs1fr878+c=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d216ade5a0091ce60076bf1f8bc816433a1fc5da", + "rev": "ca93f28abd2147dd9997261dcaeacc5a30dba463", "type": "github" }, "original": { diff --git a/nix/packages/git-prole.nix b/nix/packages/git-prole.nix index 7e00c62..b7a0a75 100644 --- a/nix/packages/git-prole.nix +++ b/nix/packages/git-prole.nix @@ -12,6 +12,8 @@ installShellFiles, pkg-config, openssl, + bash, + git, }: let src = lib.cleanSourceWith { @@ -49,13 +51,17 @@ let git-prole-nextest = craneLib.cargoNextest ( commonArgs // { + nativeBuildInputs = commonArgs.nativeBuildInputs ++ [ + bash + git + ]; NEXTEST_HIDE_PROGRESS_BAR = "true"; } ); git-prole-doctest = craneLib.cargoTest ( commonArgs // { - cargoTestArgs = "--doc"; + cargoTestExtraArgs = "--doc"; } ); git-prole-clippy = craneLib.cargoClippy ( diff --git a/src/git/worktree.rs b/src/git/worktree.rs index 64b6f2c..b8a1a2e 100644 --- a/src/git/worktree.rs +++ b/src/git/worktree.rs @@ -169,7 +169,7 @@ impl<'a> GitWorktree<'a> { /// Get the full path for a new worktree with the given branch name. /// - /// This appends the [`Self::branch_dirname`] to the [`Git::worktree_container`]. + /// This appends the [`Self::dirname_for`] to the [`Self::container`]. #[instrument(level = "trace")] pub fn path_for(&self, branch: &str) -> miette::Result { Ok(self