lol

Merge pull request #146543 from mikroskeem/deno-update

authored by

Sandro and committed by
GitHub
d4c1e2a4 05e6e0ec

+12 -25
+6 -17
pkgs/development/web/deno/default.nix
··· 17 17 18 18 rustPlatform.buildRustPackage rec { 19 19 pname = "deno"; 20 - version = "1.15.3"; 20 + version = "1.16.2"; 21 21 22 22 src = fetchFromGitHub { 23 23 owner = "denoland"; 24 24 repo = pname; 25 25 rev = "v${version}"; 26 - sha256 = "sha256-IFEo2F3gayR2LmAAJXezZPXpRfZf4re3YPZRcXpqx6o="; 26 + sha256 = "sha256-Qf1eDQ6ZbBGOQIDh2q8hKjsKB0Ri9Hjqq1AMOTanML0="; 27 27 }; 28 - cargoSha256 = "sha256-9ZpPiqlqP01B9ETpVqVreivNuSMB1td4LinxXdH7PsM="; 28 + cargoSha256 = "sha256-ZA9pR8yQV5v/Xa/B7M01PIqrkBe1DVIXC5VURoE1EtI="; 29 29 30 30 # Install completions post-install 31 31 nativeBuildInputs = [ installShellFiles ]; ··· 35 35 buildInputs = lib.optionals stdenv.isDarwin 36 36 [ libiconv libobjc Security CoreServices Metal Foundation QuartzCore ]; 37 37 38 - # The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem 39 - # To avoid this we pre-download the file and place it in the locations it will require it in advance 40 - preBuild = 41 - let arch = rust.toRustTarget stdenv.hostPlatform; in 42 - '' 43 - _librusty_v8_setup() { 44 - for v in "$@"; do 45 - install -D ${librusty_v8} "target/$v/gn_out/obj/librusty_v8.a" 46 - done 47 - } 48 - 49 - # Copy over the `librusty_v8.a` file inside target/XYZ/gn_out/obj, symlink not allowed 50 - _librusty_v8_setup "debug" "release" "${arch}/release" 51 - ''; 38 + # The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem 39 + # To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE 40 + RUSTY_V8_ARCHIVE = librusty_v8; 52 41 53 42 # Tests have some inconsistencies between runs with output integration tests 54 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.32.0"; 14 + version = "0.34.0"; 15 15 shas = { 16 - x86_64-linux = "sha256-35Rm4j4BJNCfl3MQJIpKw1altzm9fgvZ6WeC2cF4Qzc="; 17 - aarch64-linux = "sha256-w1ljFwao/YMO27QSaEyVl7HEVnfzZyVOXZK4xN0205Y="; 18 - x86_64-darwin = "sha256-oNrF9lFkgMgphDElKQRXMq9uYua75e2HrfflNO+CyPk="; 19 - aarch64-darwin = "sha256-Bz9C1AChvGJYamnIg1XtYyTzmIisL0Oe/yDjB7ZebMw="; 16 + x86_64-linux = "sha256-Ly5bEfC993JH3/1VNpFu72Dv8kJYOFu+HIlEUJJcHps="; 17 + aarch64-linux = "sha256-zazlvm4uyHD6Z+2JmeHS7gQ84C83KTWOGqNjSNPgoT0="; 18 + x86_64-darwin = "sha256-RTgbtkCAuIj/ceJNbdA0yfKtFG8hSZgurEHEuUfJ7fk="; 19 + aarch64-darwin = "sha256-xrOUPEZ4tj2BK6pDeoTpTKDx4E1KUEQ+lGMyduKDvBE="; 20 20 }; 21 21 }
+1 -3
pkgs/development/web/deno/update/librusty_v8.ts
··· 25 25 ) => 26 26 fetch(`https://github.com/${owner}/${repo}/raw/${version}/core/Cargo.toml`) 27 27 .then((res) => res.text()) 28 - .then((txt) => 29 - txt.match(genValueRegExp("rusty_v8", versionRegExp))?.shift() 30 - ); 28 + .then((txt) => txt.match(genValueRegExp("v8", versionRegExp))?.shift()); 31 29 32 30 const fetchArchShaTasks = (version: string, arches: Architecture[]) => 33 31 arches.map(