Unverified Commit ef4166de authored by Emily's avatar Emily Committed by GitHub
Browse files

jujutsu: 0.26.0 -> 0.27.0 (#387469)

parents 8eb6ff44 520bf50f
Loading
Loading
Loading
Loading
+8 −17
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@
  libgit2,
  libssh2,
  openssl,
  darwin,
  libiconv,
  git,
  gnupg,
  openssh,
@@ -21,7 +19,7 @@
}:

let
  version = "0.26.0";
  version = "0.27.0";
in

rustPlatform.buildRustPackage {
@@ -32,7 +30,7 @@ rustPlatform.buildRustPackage {
    owner = "jj-vcs";
    repo = "jj";
    tag = "v${version}";
    hash = "sha256-jGy+0VDxQrgNhj+eX06FRhPP31V8QZVAM4j4yBosAGE=";
    hash = "sha256-fBgJrSglH46+NHu3spk5mC51ASDHWnOoW6veKZ0R2YA=";
  };

  useFetchCargoVendor = true;
@@ -42,25 +40,18 @@ rustPlatform.buildRustPackage {
    ./libgit2-1.9.0.patch
  ];

  cargoHash = "sha256-CtyRekrbRwUvQq2HsFwNo46RCDEGwy9e4ZU8/TwGxSU=";
  cargoHash = "sha256-35DJdAUXc2gb/EXECScwinSzzp7uaxFbUxedjqRGfj8=";

  nativeBuildInputs = [
    installShellFiles
    pkg-config
  ];

  buildInputs =
    [
  buildInputs = [
    zstd
    libgit2
    libssh2
    ]
    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin [
      darwin.apple_sdk.frameworks.Security
      darwin.apple_sdk.frameworks.SystemConfiguration
      libiconv
    ];
  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];

  nativeCheckInputs = [
    git