Merge pull request #233989 from 06kellyjac/deno

deno: 1.33.3 -> 1.34.0

authored by Weijia Wang and committed by GitHub 671cb8e6 fe3b3c9d

+8 -27
+3 -22
pkgs/development/web/deno/default.nix
··· 4 4 , fetchFromGitHub 5 5 , rustPlatform 6 6 , installShellFiles 7 - , tinycc 8 7 , libiconv 9 8 , darwin 10 9 , librusty_v8 ? callPackage ./librusty_v8.nix { } ··· 12 11 13 12 rustPlatform.buildRustPackage rec { 14 13 pname = "deno"; 15 - version = "1.33.3"; 14 + version = "1.34.0"; 16 15 17 16 src = fetchFromGitHub { 18 17 owner = "denoland"; 19 18 repo = pname; 20 19 rev = "v${version}"; 21 - hash = "sha256-E1Usmj4f3jvzllKIrItzOIe4kf0DRQWwobVGuN291Ys="; 20 + hash = "sha256-B9YzJsnbohzQQQj2Ec1szh/aY2zoYFOoEXTShwOzMlE="; 22 21 }; 23 - cargoHash = "sha256-8L9UrFQTpwG2Gw4V72NvqdqQicG0HPRdmNJPhkWqj4s="; 22 + cargoHash = "sha256-rwN7pEb6bDLb7YrcfuWC9Y0m7b+50AeLKMKx7WLKYT8="; 24 23 25 24 postPatch = '' 26 25 # upstream uses lld on aarch64-darwin for faster builds ··· 39 38 # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem 40 39 # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE 41 40 RUSTY_V8_ARCHIVE = librusty_v8; 42 - 43 - # The deno_ffi package currently needs libtcc.a on linux and macos and will try to compile it at build time 44 - # To avoid this we point it to our copy (dir) 45 - # In the future tinycc will be replaced with asm 46 - libtcc = tinycc.overrideAttrs (oa: { 47 - makeFlags = [ "libtcc.a" ]; 48 - # tests want tcc binary 49 - doCheck = false; 50 - outputs = [ "out" ]; 51 - installPhase = '' 52 - mkdir -p $out/lib/ 53 - mv libtcc.a $out/lib/ 54 - ''; 55 - # building the whole of tcc on darwin is broken in nixpkgs 56 - # but just building libtcc.a works fine so mark this as unbroken 57 - meta.broken = false; 58 - }); 59 - TCC_PATH = "${libtcc}/lib"; 60 41 61 42 # Tests have some inconsistencies between runs with output integration tests 62 43 # Skipping until resolved
+5 -5
pkgs/development/web/deno/librusty_v8.nix
··· 11 11 }; 12 12 in 13 13 fetch_librusty_v8 { 14 - version = "0.71.1"; 14 + version = "0.72.0"; 15 15 shas = { 16 - x86_64-linux = "sha256-QCqCJdNaOLXggIGQhLOV/NvbMebfA3g1iyiBtkPDS9A="; 17 - aarch64-linux = "sha256-r9/1086GQolGfc3iqIxZzTmoC7G/1vK4QG4Qvm0zUOo="; 18 - x86_64-darwin = "sha256-kMpB9F2sTxjqnplOznvv20fa7AhdnEeIb3yb4qa72e0="; 19 - aarch64-darwin = "sha256-jWjPJa3bWynoMUmccASggvu25NaHpn/AsTnC/JMyr8o="; 16 + x86_64-linux = "sha256-APF8pCLLJ2m2XdvsecEQu5HBuNZx+WO/qRGdwogZi10="; 17 + aarch64-linux = "sha256-clhSbml1qnPGEU6KfhVouIHqWTWjZeN6xLw+AIhHuKI="; 18 + x86_64-darwin = "sha256-2pEpeDJucUIOY0pOpbaUAKW4is7A1Axz+ZDhDSiIEa8="; 19 + aarch64-darwin = "sha256-BL9u5nS0okQyLzLWJh70vyqBoSGW6bJaYzxeCNHGBwg="; 20 20 }; 21 21 }