git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #120908 from 06kellyjac/just

just: 0.9.0 -> 0.9.1

commit65126243e6e7bb8e3f9daf89af1e21f50f7beb4f authorSandro <sandro.jaeckel@gmail.com> dateFri 30 Apr 2021, 10:22 (6 years ago) parentde2515014f7c5a
1 file changed+10−4
pkgs/development/tools/just/default.nix+10−4
pkgs/development/tools/just/default.nix+10−4
@@ -2,16 +2,16 @@
22
33rustPlatform.buildRustPackage rec {
44 pname = "just";
5− version = "0.9.0";
5+ version = "0.9.1";
66
77 src = fetchFromGitHub {
88 owner = "casey";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "sha256-orHUovyFFOPRvbfLKQhkfZzM0Gs2Cpe1uJg/6+P8HKY=";
11+ sha256 = "sha256-5W/5HgXjDmr2JGYGy5FPmCNIuAagmzEHnskDUg+FzjY=";
1212 };
1313
14− cargoSha256 = "sha256-YDIGZRbszhgWM7iAc2i89jyndZvZZsg63ADQfqFxfXw=";
14+ cargoSha256 = "sha256-4lLWtj/MLaSZU7nC4gVn7TyhaLtO1FUSinQejocpiuY=";
1515
1616 nativeBuildInputs = [ installShellFiles ];
1717 buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
@@ -32,15 +32,21 @@ rustPlatform.buildRustPackage rec {
3232 export USER=just-user
3333 export USERNAME=just-user
3434
35+ # Prevent string.rs from being changed
36+ cp tests/string.rs $TMPDIR/string.rs
37+
3538 sed -i src/justfile.rs \
3639 -i tests/*.rs \
3740 -e "s@/bin/echo@${coreutils}/bin/echo@g" \
3841 -e "s@#!/usr/bin/env sh@#!${bash}/bin/sh@g" \
3942 -e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" \
4043 -e "s@#!/usr/bin/env bash@#!${bash}/bin/sh@g"
44+
45+ # Return unchanged string.rs
46+ cp $TMPDIR/string.rs tests/string.rs
4147 '';
4248
43− # Skip "edit" when running "cargo test", since this test case needs "cat".
49+ # Skip "edit" when running "cargo test", since this test case needs "cat" and "vim".
4450 # Skip "choose" when running "cargo test", since this test case needs "fzf".
4551 checkFlags = [ "--skip=choose" "--skip=edit" ];
4652