Merge pull request #84770 from xrelkd/update/just

just: 0.4.5 -> 0.5.10
This commit is contained in:
Jörg Thalheim 2020-04-10 06:52:51 +01:00 committed by GitHub
commit 70d6f5cef2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,16 +2,26 @@
rustPlatform.buildRustPackage rec {
pname = "just";
version = "0.4.5";
version = "0.5.10";
src = fetchFromGitHub {
owner = "casey";
repo = pname;
rev = "v${version}";
sha256 = "0a4bml9nxvyh110a60l4lc11yr2ds5r8d3iplslccrkq1ka96av9";
sha256 = "0s8np28glzn3kmh59dwk86yc9fb2lm9fq2325kzmy7rkb5jsdcl1";
};
cargoSha256 = "0wp61zjws9r1aapkapvq2vmad5kylkpw03wa82qhhq30knkpvr7b";
cargoSha256 = "05mrzav3aydvwac9jjckdmlxvxnlcncmkfsdb9z7zvxia4k89w1l";
postInstall = ''
# generate completion scripts for just
mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions}
$out/bin/just --completions bash > "$out/share/bash-completion/completions/just"
$out/bin/just --completions fish > "$out/share/fish/vendor_completions.d/just.fish"
$out/bin/just --completions zsh > "$out/share/zsh/site-functions/_just"
'';
checkInputs = [ coreutils bash dash ];
@ -20,20 +30,25 @@ rustPlatform.buildRustPackage rec {
export USER=just-user
export USERNAME=just-user
sed -i tests/integration.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"
sed -i tests/interrupts.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"
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 cat@#!${coreutils}/bin/cat@g" \
-e "s@#!/usr/bin/env bash@#!${bash}/bin/sh@g"
'';
# Skip "edit" when running "cargo test",
# since this test case needs "cat".
checkPhase = ''
runHook preCheck
echo "Running cargo test --
--skip edit
''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}"
cargo test -- \
--skip edit \
''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"}
runHook postCheck
'';
meta = with stdenv.lib; {