mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 12:42:24 +00:00
Code Issues Wiki Activity

Merge pull request #95937 from 06kellyjac/deno_1.3.1

Browse source 
deno: 1.3.0 -> 1.3.1
This commit is contained in:
Daniël de Kok 2020-08-22 08:45:17 +02:00 committed by GitHub
parent ae1898a70d 01c32e49a9
commit de5a644adf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/web/deno/default.nix
View file

@ -18,16 +18,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "deno";
version = "1.3.0";
version = "1.3.1";
src = fetchFromGitHub {
owner = "denoland";
repo = pname;
rev = "v${version}";
sha256 = "163qvxggdv4mr1r1nab4s5n2b74bji0iil4r4nmp6n2ghssyf01h";
sha256 = "1j5ajasng380p5a7nkk9ag5zp9ybwfz7b2z42lyk1wfg0pcd6j0r";
fetchSubmodules = true;
};
cargoSha256 = "11i00a92i2d6y2vj04wa6qbpsd351qcdy6a9ansq6n3928m9f2pk";
cargoSha256 = "0ba7afk4n7k170cqwy0gjc53vz6bjc176s9w1wln6yfhh55fyw6x";
# Install completions post-install
nativeBuildInputs = [ installShellFiles ];

15
pkgs/development/web/deno/update/common.ts
View file

@ -8,7 +8,20 @@ const run = async (command: string, args: string[]) => {
{ cmd: [command, ...args], stdout: "piped", stderr: "piped" },
);
if (!(await cmd.status()).success) {
throw await cmd.stderrOutput().then((b) => decode(b));
const error = await cmd.stderrOutput().then((b) => decode(b).trimEnd());
// Known error we can ignore
if (error.includes("'allow-unsafe-native-code-during-evaluation'")) {
// Extract the target sha256 out of the error
const target = " got: sha256:";
const match = error
.split("\n")
.find((l) => l.includes(target))
?.split(target)[1];
if (typeof match !== "undefined") {
return match;
}
}
throw new Error(error);
}
return cmd.output().then((b) => decode(b).trimEnd());
};