Unverified Commit 00a5a056 authored by Florian Klink's avatar Florian Klink Committed by GitHub
Browse files

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

josh: cherry-pick upstream patch to fix build with rust 1.73
parents ab5d8762 14eaf39d

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

+8 −0
Original line number Diff line number Diff line
@@ -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";