From e50d10b4aac7581f25b5825fdf243404585df122 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 9 Nov 2020 20:00:47 +0000 Subject: [PATCH 1/2] deno: 1.5.1 -> 1.5.2 --- pkgs/development/web/deno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 0c60821102d..00c9a1a29b8 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "19ki9qyg9q26jq4jkcf8b6xhy4g4cn30zqccgl3324mnijhl33jk"; + sha256 = "0dpx74zp85a3qcabfmwnsh1kl0c74ygafybqzmyvwjmax0hdgkq6"; fetchSubmodules = true; }; - cargoSha256 = "1q3gmilphkbh54y7m711ccr1gr5slk2nn91qq61rmmphyylwkgv2"; + cargoSha256 = "0358vbpda9x0ib0vla4crn052lk299x2hg14g8lzymg33277lk3p"; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; From 24ff3949b01c0e2e7655ff7132964106930fc35a Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Mon, 9 Nov 2020 21:36:07 +0000 Subject: [PATCH 2/2] deno: move to new installShellCompletion style --- pkgs/development/web/deno/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 00c9a1a29b8..5fe6eb0575d 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -52,15 +52,14 @@ rustPlatform.buildRustPackage rec { # Skipping until resolved doCheck = false; - # TODO: Move to enhanced installShellCompletion when merged: PR #83630 postInstall = '' # remove test plugin and test server rm -rf $out/lib $out/bin/test_server - $out/bin/deno completions bash > deno.bash - $out/bin/deno completions fish > deno.fish - $out/bin/deno completions zsh > _deno - installShellCompletion deno.{bash,fish} --zsh _deno + installShellCompletion --cmd deno \ + --bash <($out/bin/deno completions bash) \ + --fish <($out/bin/deno completions fish) \ + --zsh <($out/bin/deno completions zsh) ''; passthru.updateScript = ./update/update.ts;