Unverified Commit b6a6bd6b authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

spade: 0.12.0 -> 0.13.0 (#383947)

parents 96042c69 70234c6f
Loading
Loading
Loading
Loading
+2320 −370

File changed.

Preview size limit exceeded, changes collapsed.

+12 −4
Original line number Diff line number Diff line
@@ -8,19 +8,21 @@
  nix-update,
  writeScript,
  git,
  pkg-config,
  openssl,
  python312,
  swim,
}:

rustPlatform.buildRustPackage rec {
  pname = "spade";
  version = "0.12.0";
  version = "0.13.0";

  src = fetchFromGitLab {
    owner = "spade-lang";
    repo = "spade";
    rev = "v${version}";
    hash = "sha256-AarFH0D0ApZ+i6qtKy7zM2iwg/QeYoLwOHbg+d6Q78k=";
    hash = "sha256-eWeEbwIm+PC0XHmvV3xZqUIcA01arnalbGFtPTUP9tg=";
    # only needed for vatch, which contains test data
    fetchSubmodules = true;
  };
@@ -28,7 +30,7 @@ rustPlatform.buildRustPackage rec {
  cargoLock = {
    lockFile = ./Cargo.lock;
    outputHashes = {
      "codespan-0.12.0" = "sha256-3F2006BR3hyhxcUTaQiOjzTEuRECKJKjIDyXonS/lrE=";
      "swim-0.12.0" = "sha256-9uqla3MRweQvMVLn31yHJJjRtY7YuDtofsHRE/Xqz5E=";
    };
  };

@@ -51,7 +53,13 @@ rustPlatform.buildRustPackage rec {
    })
  ];

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ python312 ];
  nativeBuildInputs = [
    pkg-config
  ];

  buildInputs = [
    openssl
  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ python312 ];
  env.NIX_CFLAGS_LINK = lib.optionalString stdenv.hostPlatform.isDarwin "-L${python312}/lib/python3.12/config-3.12-darwin -lpython3.12";

  passthru.tests = {
+3 −3
Original line number Diff line number Diff line
@@ -12,17 +12,17 @@

rustPlatform.buildRustPackage rec {
  pname = "swim";
  version = "0.12.0";
  version = "0.13.0";

  src = fetchFromGitLab {
    owner = "spade-lang";
    repo = "swim";
    rev = "v${version}";
    hash = "sha256-GJQzz9o0QKbnE8l1MEjdW36S/rJo2GoaK02Qnl9dtEA=";
    hash = "sha256-0H45kOIwFMdp+eIQJNutLUC/jEpWKsPfEZXDUOUa12g=";
  };

  useFetchCargoVendor = true;
  cargoHash = "sha256-J4u89zP3+AI4nSUJkQ4HNGmbwLnmCYUf4WVRBhPVAC4=";
  cargoHash = "sha256-fF+43tZzr6lxVovMCIaDwf9JKweqiMMR+BNojIqQREY=";

  preConfigure = ''
    # de-vendor spade git submodule