cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

josh: cherry-pick upstream patch to fix build with rust 1.73

Browse source 
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
This commit is contained in:
Adam Joseph 2023-11-08 00:15:46 -08:00
parent dcbe9faa12
commit 14eaf39d49
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/version-management/josh/default.nix
View file

@ -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";