Unverified Commit 671cb8e6 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #233989 from 06kellyjac/deno

deno: 1.33.3 -> 1.34.0
parents fe3b3c9d bf12e00b
Loading
Loading
Loading
Loading
+3 −22
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@
, fetchFromGitHub
, rustPlatform
, installShellFiles
, tinycc
, libiconv
, darwin
, librusty_v8 ? callPackage ./librusty_v8.nix { }
@@ -12,15 +11,15 @@

rustPlatform.buildRustPackage rec {
  pname = "deno";
  version = "1.33.3";
  version = "1.34.0";

  src = fetchFromGitHub {
    owner = "denoland";
    repo = pname;
    rev = "v${version}";
    hash = "sha256-E1Usmj4f3jvzllKIrItzOIe4kf0DRQWwobVGuN291Ys=";
    hash = "sha256-B9YzJsnbohzQQQj2Ec1szh/aY2zoYFOoEXTShwOzMlE=";
  };
  cargoHash = "sha256-8L9UrFQTpwG2Gw4V72NvqdqQicG0HPRdmNJPhkWqj4s=";
  cargoHash = "sha256-rwN7pEb6bDLb7YrcfuWC9Y0m7b+50AeLKMKx7WLKYT8=";

  postPatch = ''
    # upstream uses lld on aarch64-darwin for faster builds
@@ -40,24 +39,6 @@ rustPlatform.buildRustPackage rec {
  # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE
  RUSTY_V8_ARCHIVE = librusty_v8;

  # The deno_ffi package currently needs libtcc.a on linux and macos and will try to compile it at build time
  # To avoid this we point it to our copy (dir)
  # In the future tinycc will be replaced with asm
  libtcc = tinycc.overrideAttrs (oa: {
    makeFlags = [ "libtcc.a" ];
    # tests want tcc binary
    doCheck = false;
    outputs = [ "out" ];
    installPhase = ''
      mkdir -p $out/lib/
      mv libtcc.a $out/lib/
    '';
    # building the whole of tcc on darwin is broken in nixpkgs
    # but just building libtcc.a works fine so mark this as unbroken
    meta.broken = false;
  });
  TCC_PATH = "${libtcc}/lib";

  # Tests have some inconsistencies between runs with output integration tests
  # Skipping until resolved
  doCheck = false;
+5 −5
Original line number Diff line number Diff line
@@ -11,11 +11,11 @@ let
  };
in
fetch_librusty_v8 {
  version = "0.71.1";
  version = "0.72.0";
  shas = {
    x86_64-linux = "sha256-QCqCJdNaOLXggIGQhLOV/NvbMebfA3g1iyiBtkPDS9A=";
    aarch64-linux = "sha256-r9/1086GQolGfc3iqIxZzTmoC7G/1vK4QG4Qvm0zUOo=";
    x86_64-darwin = "sha256-kMpB9F2sTxjqnplOznvv20fa7AhdnEeIb3yb4qa72e0=";
    aarch64-darwin = "sha256-jWjPJa3bWynoMUmccASggvu25NaHpn/AsTnC/JMyr8o=";
    x86_64-linux = "sha256-APF8pCLLJ2m2XdvsecEQu5HBuNZx+WO/qRGdwogZi10=";
    aarch64-linux = "sha256-clhSbml1qnPGEU6KfhVouIHqWTWjZeN6xLw+AIhHuKI=";
    x86_64-darwin = "sha256-2pEpeDJucUIOY0pOpbaUAKW4is7A1Axz+ZDhDSiIEa8=";
    aarch64-darwin = "sha256-BL9u5nS0okQyLzLWJh70vyqBoSGW6bJaYzxeCNHGBwg=";
  };
}