pyrox.dev
Merge pull request #120908 from 06kellyjac/just
just: 0.9.0 -> 0.9.1
+10
-4
pkgs/development/tools/just/default.nix
+10
-4
pkgs/development/tools/just/default.nix
···
2
3
rustPlatform.buildRustPackage rec {
4
pname = "just";
5
-
version = "0.9.0";
6
7
src = fetchFromGitHub {
8
owner = "casey";
9
repo = pname;
10
rev = "v${version}";
11
-
sha256 = "sha256-orHUovyFFOPRvbfLKQhkfZzM0Gs2Cpe1uJg/6+P8HKY=";
12
};
13
14
-
cargoSha256 = "sha256-YDIGZRbszhgWM7iAc2i89jyndZvZZsg63ADQfqFxfXw=";
15
16
nativeBuildInputs = [ installShellFiles ];
17
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
···
32
export USER=just-user
33
export USERNAME=just-user
34
35
sed -i src/justfile.rs \
36
-i tests/*.rs \
37
-e "s@/bin/echo@${coreutils}/bin/echo@g" \
38
-e "s@#!/usr/bin/env sh@#!${bash}/bin/sh@g" \
39
-e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" \
40
-e "s@#!/usr/bin/env bash@#!${bash}/bin/sh@g"
41
'';
42
43
-
# Skip "edit" when running "cargo test", since this test case needs "cat".
44
# Skip "choose" when running "cargo test", since this test case needs "fzf".
45
checkFlags = [ "--skip=choose" "--skip=edit" ];
46
···
2
3
rustPlatform.buildRustPackage rec {
4
pname = "just";
5
+
version = "0.9.1";
6
7
src = fetchFromGitHub {
8
owner = "casey";
9
repo = pname;
10
rev = "v${version}";
11
+
sha256 = "sha256-5W/5HgXjDmr2JGYGy5FPmCNIuAagmzEHnskDUg+FzjY=";
12
};
13
14
+
cargoSha256 = "sha256-4lLWtj/MLaSZU7nC4gVn7TyhaLtO1FUSinQejocpiuY=";
15
16
nativeBuildInputs = [ installShellFiles ];
17
buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
···
32
export USER=just-user
33
export USERNAME=just-user
34
35
+
# Prevent string.rs from being changed
36
+
cp tests/string.rs $TMPDIR/string.rs
37
+
38
sed -i src/justfile.rs \
39
-i tests/*.rs \
40
-e "s@/bin/echo@${coreutils}/bin/echo@g" \
41
-e "s@#!/usr/bin/env sh@#!${bash}/bin/sh@g" \
42
-e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" \
43
-e "s@#!/usr/bin/env bash@#!${bash}/bin/sh@g"
44
+
45
+
# Return unchanged string.rs
46
+
cp $TMPDIR/string.rs tests/string.rs
47
'';
48
49
+
# Skip "edit" when running "cargo test", since this test case needs "cat" and "vim".
50
# Skip "choose" when running "cargo test", since this test case needs "fzf".
51
checkFlags = [ "--skip=choose" "--skip=edit" ];
52