just: 0.9.0 -> 0.9.1
This commit is contained in:
parent
ba6f0e8f03
commit
14f7c5a4ec
|
@ -2,16 +2,16 @@
|
||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "just";
|
pname = "just";
|
||||||
version = "0.9.0";
|
version = "0.9.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "casey";
|
owner = "casey";
|
||||||
repo = pname;
|
repo = pname;
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-orHUovyFFOPRvbfLKQhkfZzM0Gs2Cpe1uJg/6+P8HKY=";
|
sha256 = "sha256-5W/5HgXjDmr2JGYGy5FPmCNIuAagmzEHnskDUg+FzjY=";
|
||||||
};
|
};
|
||||||
|
|
||||||
cargoSha256 = "sha256-YDIGZRbszhgWM7iAc2i89jyndZvZZsg63ADQfqFxfXw=";
|
cargoSha256 = "sha256-4lLWtj/MLaSZU7nC4gVn7TyhaLtO1FUSinQejocpiuY=";
|
||||||
|
|
||||||
nativeBuildInputs = [ installShellFiles ];
|
nativeBuildInputs = [ installShellFiles ];
|
||||||
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
|
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
|
||||||
|
@ -32,15 +32,21 @@ rustPlatform.buildRustPackage rec {
|
||||||
export USER=just-user
|
export USER=just-user
|
||||||
export USERNAME=just-user
|
export USERNAME=just-user
|
||||||
|
|
||||||
|
# Prevent string.rs from being changed
|
||||||
|
cp tests/string.rs $TMPDIR/string.rs
|
||||||
|
|
||||||
sed -i src/justfile.rs \
|
sed -i src/justfile.rs \
|
||||||
-i tests/*.rs \
|
-i tests/*.rs \
|
||||||
-e "s@/bin/echo@${coreutils}/bin/echo@g" \
|
-e "s@/bin/echo@${coreutils}/bin/echo@g" \
|
||||||
-e "s@#!/usr/bin/env sh@#!${bash}/bin/sh@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 cat@#!${coreutils}/bin/cat@g" \
|
||||||
-e "s@#!/usr/bin/env bash@#!${bash}/bin/sh@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".
|
# Skip "choose" when running "cargo test", since this test case needs "fzf".
|
||||||
checkFlags = [ "--skip=choose" "--skip=edit" ];
|
checkFlags = [ "--skip=choose" "--skip=edit" ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue