Unverified Commit 0507de31 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #333928 from afresquet-contrib/cargo-shuttle-bump

cargo-shuttle: 0.45.0 -> 0.47.0
parents fe18d409 99fef761
Loading
Loading
Loading
Loading
+696 −591

File changed.

Preview size limit exceeded, changes collapsed.

+26 −22
Original line number Diff line number Diff line
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, openssl
, zlib
, stdenv
, darwin
{
  lib,
  rustPlatform,
  fetchFromGitHub,
  pkg-config,
  openssl,
  zlib,
  stdenv,
  darwin,
}:

rustPlatform.buildRustPackage rec {
  pname = "cargo-shuttle";
  version = "0.45.0";
  version = "0.47.0";

  src = fetchFromGitHub {
    owner = "shuttle-hq";
    repo = "shuttle";
    rev = "v${version}";
    hash = "sha256-bjGyLfeo11Y55WqPwcUxnNkexozlxC61/rSa65gBGZ4=";
    hash = "sha256-AJ+7IUxi5SRRWw0EHh9JmQHkdQU3Mhd1Nmo1peEG2zg=";
  };

  cargoLock = {
@@ -29,19 +30,22 @@ rustPlatform.buildRustPackage rec {
    };
  };

  nativeBuildInputs = [
    pkg-config
  ];
  nativeBuildInputs = [ pkg-config ];

  buildInputs = [
  buildInputs =
    [
      openssl
      zlib
  ] ++ lib.optionals stdenv.isDarwin [
    ]
    ++ lib.optionals stdenv.isDarwin [
      darwin.apple_sdk.frameworks.CoreServices
      darwin.apple_sdk.frameworks.SystemConfiguration
    ];

  cargoBuildFlags = [ "-p" "cargo-shuttle" ];
  cargoBuildFlags = [
    "-p"
    "cargo-shuttle"
  ];

  cargoTestFlags = cargoBuildFlags ++ [
    # other tests are failing for different reasons