Merge pull request #120908 from 06kellyjac/just

just: 0.9.0 -> 0.9.1
This commit is contained in:
Sandro 2021-04-30 10:22:32 +02:00 committed by GitHub
commit 65126243e6
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.0";
version = "0.9.1";
src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = "v${version}";
sha256 = "sha256-orHUovyFFOPRvbfLKQhkfZzM0Gs2Cpe1uJg/6+P8HKY=";
sha256 = "sha256-5W/5HgXjDmr2JGYGy5FPmCNIuAagmzEHnskDUg+FzjY=";
};
cargoSha256 = "sha256-YDIGZRbszhgWM7iAc2i89jyndZvZZsg63ADQfqFxfXw=";
cargoSha256 = "sha256-4lLWtj/MLaSZU7nC4gVn7TyhaLtO1FUSinQejocpiuY=";
nativeBuildInputs = [ installShellFiles ];
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
@ -32,15 +32,21 @@ rustPlatform.buildRustPackage rec {
export USER=just-user
export USERNAME=just-user
# Prevent string.rs from being changed
cp tests/string.rs $TMPDIR/string.rs
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"
# Return unchanged string.rs
cp $TMPDIR/string.rs tests/string.rs
'';
# Skip "edit" when running "cargo test", since this test case needs "cat".
# 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" ];