diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-04-10 06:52:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-10 06:52:51 +0100 |
commit | 70d6f5cef296b00172711778c7e4e5f16141ae33 (patch) | |
tree | a976a68494b0d55bb12cae6c0be0fa11bb5f1d30 | |
parent | 4bf632f495a7bdd5fe46575b36d8e772ed804f8b (diff) | |
parent | 39ac8da867450844fa44ce7928e6cd38d8f08729 (diff) | |
download | nixpkgs-70d6f5cef296b00172711778c7e4e5f16141ae33.tar nixpkgs-70d6f5cef296b00172711778c7e4e5f16141ae33.tar.gz nixpkgs-70d6f5cef296b00172711778c7e4e5f16141ae33.tar.bz2 nixpkgs-70d6f5cef296b00172711778c7e4e5f16141ae33.tar.lz nixpkgs-70d6f5cef296b00172711778c7e4e5f16141ae33.tar.xz nixpkgs-70d6f5cef296b00172711778c7e4e5f16141ae33.tar.zst nixpkgs-70d6f5cef296b00172711778c7e4e5f16141ae33.zip |
Merge pull request #84770 from xrelkd/update/just
just: 0.4.5 -> 0.5.10
-rw-r--r-- | pkgs/development/tools/just/default.nix | 43 |
1 files changed, 29 insertions, 14 deletions
diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 5641a14e1ab..b0b73d03d10 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -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; { |