Commit 1bd503aa authored by Florian Klink's avatar Florian Klink Committed by Alyssa Ross
Browse files

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 https://github.com/NixOS/nixpkgs/issues/332957 for context.
parent 52ab1263

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

+9 −6
Original line number Diff line number Diff line
@@ -13,21 +13,21 @@ 
let

  # josh-ui requires javascript dependencies, haven't tried to figure it out yet

  cargoFlags = [ "--workspace" "--exclude" "josh-ui" ];

  version = "24.08.14";

in



rustPlatform.buildRustPackage rec {

rustPlatform.buildRustPackage {

  pname = "josh";

  version = "23.12.04";

  JOSH_VERSION = "r${version}";

  inherit version;



  src = fetchFromGitHub {

    owner = "esrlabs";

    repo = "josh";

    rev = JOSH_VERSION;

    sha256 = "10fspcafqnv6if5c1h8z9pf9140jvvlrch88w62wsg4w2vhaii0v";

    rev = "v${version}";

    hash = "sha256-6U1nhERpPQAVgQm6xwRlHIhslYBLd65DomuGn5yRiSs=";

  };



  cargoHash = "sha256-g4/Z3QUFBeWlqhnZ2VhmdAjya4A+vwXQa7QYZ+CgG8g=";

  cargoHash = "sha256-s6+Bd4ucwUinrcbjNvlDsf9LhWc/U9SAvBRW7JAmxVA=";



  nativeBuildInputs = [

    pkg-config
@@ -44,6 +44,9 @@ rustPlatform.buildRustPackage rec { 
  cargoBuildFlags = cargoFlags;

  cargoTestFlags = cargoFlags;



  # used to teach josh itself about its version number

  env.JOSH_VERSION = "r${version}";



  postInstall = ''

    wrapProgram "$out/bin/josh-proxy" --prefix PATH : "${git}/bin"

  '';