ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-03 02:57:30 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #146543 from mikroskeem/deno-update

Browse Source
This commit is contained in:
Sandro 2021-11-19 15:33:20 +01:00 committed by GitHub
commit d4c1e2a4c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/development/web/deno/default.nix
View File

@ -17,15 +17,15 @@
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.15.3";
version = "1.16.2";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
sha256 = "sha256-IFEo2F3gayR2LmAAJXezZPXpRfZf4re3YPZRcXpqx6o=";
sha256 = "sha256-Qf1eDQ6ZbBGOQIDh2q8hKjsKB0Ri9Hjqq1AMOTanML0=";
};
cargoSha256 = "sha256-9ZpPiqlqP01B9ETpVqVreivNuSMB1td4LinxXdH7PsM=";
cargoSha256 = "sha256-ZA9pR8yQV5v/Xa/B7M01PIqrkBe1DVIXC5VURoE1EtI=";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];
@ -35,20 +35,9 @@ rustPlatform.buildRustPackage rec {
buildInputs = lib.optionals stdenv.isDarwin
[ libiconv libobjc Security CoreServices Metal Foundation QuartzCore ];
# The rusty_v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem
# To avoid this we pre-download the file and place it in the locations it will require it in advance
preBuild =
let arch = rust.toRustTarget stdenv.hostPlatform; in
''
_librusty_v8_setup() {
for v in "$@"; do
install -D ${librusty_v8} "target/$v/gn_out/obj/librusty_v8.a"
done
}
# Copy over the `librusty_v8.a` file inside target/XYZ/gn_out/obj, symlink not allowed
_librusty_v8_setup "debug" "release" "${arch}/release"
'';
# The v8 package will try to download a `librusty_v8.a` release at build time to our read-only filesystem
# To avoid this we pre-download the file and export it via RUSTY_V8_ARCHIVE
RUSTY_V8_ARCHIVE = librusty_v8;
# Tests have some inconsistencies between runs with output integration tests
# Skipping until resolved

10
pkgs/development/web/deno/librusty_v8.nix
View File

@ -11,11 +11,11 @@ let
};
in
fetch_librusty_v8 {
version = "0.32.0";
version = "0.34.0";
shas = {
x86_64-linux = "sha256-35Rm4j4BJNCfl3MQJIpKw1altzm9fgvZ6WeC2cF4Qzc=";
aarch64-linux = "sha256-w1ljFwao/YMO27QSaEyVl7HEVnfzZyVOXZK4xN0205Y=";
x86_64-darwin = "sha256-oNrF9lFkgMgphDElKQRXMq9uYua75e2HrfflNO+CyPk=";
aarch64-darwin = "sha256-Bz9C1AChvGJYamnIg1XtYyTzmIisL0Oe/yDjB7ZebMw=";
x86_64-linux = "sha256-Ly5bEfC993JH3/1VNpFu72Dv8kJYOFu+HIlEUJJcHps=";
aarch64-linux = "sha256-zazlvm4uyHD6Z+2JmeHS7gQ84C83KTWOGqNjSNPgoT0=";
x86_64-darwin = "sha256-RTgbtkCAuIj/ceJNbdA0yfKtFG8hSZgurEHEuUfJ7fk=";
aarch64-darwin = "sha256-xrOUPEZ4tj2BK6pDeoTpTKDx4E1KUEQ+lGMyduKDvBE=";
};
}

4
pkgs/development/web/deno/update/librusty_v8.ts
View File

@ -25,9 +25,7 @@ const getLibrustyV8Version = async (
) =>
fetch(`https://github.com/${owner}/${repo}/raw/${version}/core/Cargo.toml`)
.then((res) => res.text())
.then((txt) =>
txt.match(genValueRegExp("rusty_v8", versionRegExp))?.shift()
);
.then((txt) => txt.match(genValueRegExp("v8", versionRegExp))?.shift());
const fetchArchShaTasks = (version: string, arches: Architecture[]) =>
arches.map(