Merge pull request #125653 from 06kellyjac/just

just: 0.9.1 -> 0.9.4
This commit is contained in:
Sandro 2021-06-09 13:02:46 +02:00 committed by GitHub
commit 9845b1f590
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "just";
version = "0.9.1";
version = "0.9.4";
src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = "v${version}";
sha256 = "sha256-5W/5HgXjDmr2JGYGy5FPmCNIuAagmzEHnskDUg+FzjY=";
sha256 = "sha256-C0W5oMnKlQ5hg/0YLKZKiQfLghJ7yAJYW6k0G6eOFQE=";
};
cargoSha256 = "sha256-4lLWtj/MLaSZU7nC4gVn7TyhaLtO1FUSinQejocpiuY=";
cargoSha256 = "sha256-TqvUunBFpKIog0pG85M/JLz8orncgbRqnQolseXYSo4=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
@ -31,6 +31,7 @@ rustPlatform.buildRustPackage rec {
# USER must not be empty
export USER=just-user
export USERNAME=just-user
export JUST_CHOOSER="${coreutils}/bin/cat"
# Prevent string.rs from being changed
cp tests/string.rs $TMPDIR/string.rs
@ -38,22 +39,22 @@ rustPlatform.buildRustPackage rec {
sed -i src/justfile.rs \
-i tests/*.rs \
-e "s@/bin/echo@${coreutils}/bin/echo@g" \
-e "s@#!/usr/bin/env sh@#!${bash}/bin/sh@g" \
-e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" \
-e "s@#!/usr/bin/env bash@#!${bash}/bin/sh@g"
-e "s@/usr/bin/env@${coreutils}/bin/env@g"
# Return unchanged string.rs
cp $TMPDIR/string.rs tests/string.rs
'';
# Skip "edit" when running "cargo test", since this test case needs "cat" and "vim".
# Skip "choose" when running "cargo test", since this test case needs "fzf".
checkFlags = [ "--skip=choose" "--skip=edit" ];
checkFlags = [
"--skip=edit" # trying to run "vim" fails as there's no /usr/bin/env or which in the sandbox to find vim and the dependency is not easily patched
"--skip=run_shebang" # test case very rarely fails with "Text file busy"
];
meta = with lib; {
description = "A handy way to save and run project-specific commands";
homepage = "https://github.com/casey/just";
changelog = "https://github.com/casey/just/blob/v${version}/CHANGELOG.md";
description = "A handy way to save and run project-specific commands";
license = licenses.cc0;
maintainers = with maintainers; [ xrelkd ];
maintainers = with maintainers; [ xrelkd jk ];
};
}