Skip to content

Commit 1bd503a

Browse files
floklialyssais
authored andcommitted
josh: 23.12.04 -> 24.08.14
This bumps josh to the new release, which includes a fix for the Rust 1.80 compilation issue. See #332957 for context.
1 parent 52ab126 commit 1bd503a

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

pkgs/applications/version-management/josh/default.nix

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@
1313
let
1414
# josh-ui requires javascript dependencies, haven't tried to figure it out yet
1515
cargoFlags = [ "--workspace" "--exclude" "josh-ui" ];
16+
version = "24.08.14";
1617
in
1718

18-
rustPlatform.buildRustPackage rec {
19+
rustPlatform.buildRustPackage {
1920
pname = "josh";
20-
version = "23.12.04";
21-
JOSH_VERSION = "r${version}";
21+
inherit version;
2222

2323
src = fetchFromGitHub {
2424
owner = "esrlabs";
2525
repo = "josh";
26-
rev = JOSH_VERSION;
27-
sha256 = "10fspcafqnv6if5c1h8z9pf9140jvvlrch88w62wsg4w2vhaii0v";
26+
rev = "v${version}";
27+
hash = "sha256-6U1nhERpPQAVgQm6xwRlHIhslYBLd65DomuGn5yRiSs=";
2828
};
2929

30-
cargoHash = "sha256-g4/Z3QUFBeWlqhnZ2VhmdAjya4A+vwXQa7QYZ+CgG8g=";
30+
cargoHash = "sha256-s6+Bd4ucwUinrcbjNvlDsf9LhWc/U9SAvBRW7JAmxVA=";
3131

3232
nativeBuildInputs = [
3333
pkg-config
@@ -44,6 +44,9 @@ rustPlatform.buildRustPackage rec {
4444
cargoBuildFlags = cargoFlags;
4545
cargoTestFlags = cargoFlags;
4646

47+
# used to teach josh itself about its version number
48+
env.JOSH_VERSION = "r${version}";
49+
4750
postInstall = ''
4851
wrapProgram "$out/bin/josh-proxy" --prefix PATH : "${git}/bin"
4952
'';

0 commit comments

Comments
 (0)