diff options
author | Adam Joseph <adam@westernsemico.com> | 2023-11-08 00:15:46 -0800 |
---|---|---|
committer | Adam Joseph <adam@westernsemico.com> | 2023-11-08 00:21:31 -0800 |
commit | 14eaf39d493bcf6b00c29856f497d4f78d64ee2d (patch) | |
tree | 6adee33fadd5157a6ac75ef9378cfbc7821e390c /pkgs | |
parent | dcbe9faa12f412e3bdbd2efa510d733648e2549c (diff) |
josh: cherry-pick upstream patch to fix build with rust 1.73
Our josh builds broke on staging with the new rustc 1.73: https://hydra.nixos.org/build/239619692/log/tail This commit cherry-picks the fix (already merged upstream) https://github.com/josh-project/josh/pull/1290
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/version-management/josh/default.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/josh/default.nix b/pkgs/applications/version-management/josh/default.nix index a9929cca64e47..5acd1a6343447 100644 --- a/pkgs/applications/version-management/josh/default.nix +++ b/pkgs/applications/version-management/josh/default.nix @@ -30,6 +30,14 @@ rustPlatform.buildRustPackage rec { url = "https://github.com/josh-project/josh/commit/13e7565ab029206598881391db4ddc6dface692b.patch"; sha256 = "1l5syqj51sn7kcqvffwl6ggn5sq8wfkpviga860agghnw5dpf7ns"; }) + + # Merged upstream, fixes builds with newer rustc + (fetchpatch { + name = "josh-fix-builds-with-rust-173.patch"; + url = "https://github.com/josh-project/josh/commit/7b8259b81a9acabb528ddebc4ab30fc712f756fb.patch"; + sha256 = "sha256-YfrVlH6Ox05ZbmB/15HVaFlOyRTOFbYflq0edi6/X9k="; + includes = [ "josh-proxy/src/bin/josh-proxy.rs" ]; + }) ]; cargoSha256 = "0f6cvz2s8qs53b2g6xja38m24hafqla61s4r5za0a1dyndgms7sl"; |