tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

Merge pull request #266217 from amjoseph-nixpkgs/pr/josh/rustc173

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

authored by Florian Klink and committed by GitHub 00a5a056 ab5d8762

+8
unified split
+8
pkgs/applications/version-management/josh/default.nix
··· 30 url = "https://github.com/josh-project/josh/commit/13e7565ab029206598881391db4ddc6dface692b.patch"; 31 sha256 = "1l5syqj51sn7kcqvffwl6ggn5sq8wfkpviga860agghnw5dpf7ns"; 32 }) 33 ]; 34 35 cargoSha256 = "0f6cvz2s8qs53b2g6xja38m24hafqla61s4r5za0a1dyndgms7sl";
··· 30 url = "https://github.com/josh-project/josh/commit/13e7565ab029206598881391db4ddc6dface692b.patch"; 31 sha256 = "1l5syqj51sn7kcqvffwl6ggn5sq8wfkpviga860agghnw5dpf7ns"; 32 }) 33 + 34 + # Merged upstream, fixes builds with newer rustc 35 + (fetchpatch { 36 + name = "josh-fix-builds-with-rust-173.patch"; 37 + url = "https://github.com/josh-project/josh/commit/7b8259b81a9acabb528ddebc4ab30fc712f756fb.patch"; 38 + sha256 = "sha256-YfrVlH6Ox05ZbmB/15HVaFlOyRTOFbYflq0edi6/X9k="; 39 + includes = [ "josh-proxy/src/bin/josh-proxy.rs" ]; 40 + }) 41 ]; 42 43 cargoSha256 = "0f6cvz2s8qs53b2g6xja38m24hafqla61s4r5za0a1dyndgms7sl";