diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-07 12:27:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-07 12:27:10 +0000 |
| commit | a544214cae26ad2e5bc0f6d445174e3688a5769a (patch) | |
| tree | 9fbf84f151a11948f24e4ef05427d71f284b806d | |
| parent | f19eb635b4585f6ba4f9f4c3e9e07f56623446f5 (diff) | |
| parent | 31eeb468edc92bf78f42ec3c1dcbe934daf76f54 (diff) | |
| download | nixpkgs-a544214cae26ad2e5bc0f6d445174e3688a5769a.tar nixpkgs-a544214cae26ad2e5bc0f6d445174e3688a5769a.tar.gz nixpkgs-a544214cae26ad2e5bc0f6d445174e3688a5769a.tar.bz2 nixpkgs-a544214cae26ad2e5bc0f6d445174e3688a5769a.tar.lz nixpkgs-a544214cae26ad2e5bc0f6d445174e3688a5769a.tar.xz nixpkgs-a544214cae26ad2e5bc0f6d445174e3688a5769a.tar.zst nixpkgs-a544214cae26ad2e5bc0f6d445174e3688a5769a.zip | |
Merge master into staging-next
| -rw-r--r-- | pkgs/development/tools/database/timescaledb-tune/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/tabnine/default.nix | 21 |
2 files changed, 15 insertions, 10 deletions
diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix index 2079925049d..787c7c3131b 100644 --- a/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "timescaledb-tune"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = "v${version}"; - sha256 = "0vncwwvw7y6g3crd4n5vvd6jwdsa8vsvsmfwy5mad4j6lix09ajx"; + sha256 = "0vrbbswmg6z3n012mqd1jasqk01navypzv5m00r6c9bxj72hgcxl"; }; vendorSha256 = "0hbpprbxs19fcar7xcy42kn9yfzhal2zsv5pml9ghiv2s61yns4z"; diff --git a/pkgs/development/tools/tabnine/default.nix b/pkgs/development/tools/tabnine/default.nix index 6c54e8f3c40..f18be619f26 100644 --- a/pkgs/development/tools/tabnine/default.nix +++ b/pkgs/development/tools/tabnine/default.nix @@ -1,17 +1,17 @@ -{ stdenv, lib, fetchurl }: +{ stdenv, lib, fetchurl, unzip }: let - version = "3.1.1"; + version = "3.2.63"; src = if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { - url = "https://update.tabnine.com/${version}/x86_64-apple-darwin/TabNine"; - sha256 = "w+Ufy4pICfQmseKCeohEQIP0VD6YrkYTEn41HX40Zlw="; + url = "https://update.tabnine.com/bundles/${version}/x86_64-apple-darwin/TabNine.zip"; + sha256 = "0y0wb3jdr2qk4k21c11w8c9a5fl0h2rm1wm7m8hqdywy4lz9ppgy"; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://update.tabnine.com/${version}/x86_64-unknown-linux-musl/TabNine"; - sha256 = "hSltZWQz2BRFut0NDI4fS/N8XxFJaYGHRtV3llBVOY4="; + url = "https://update.tabnine.com/bundles/${version}/x86_64-unknown-linux-musl/TabNine.zip"; + sha256 = "0zzk2w5azk5f0svjxlj2774x01xdflb767xxvbglj4223dgyx2x5"; } else throw "Not supported on ${stdenv.hostPlatform.system}"; in stdenv.mkDerivation rec { @@ -20,10 +20,15 @@ in stdenv.mkDerivation rec { inherit version src; dontBuild = true; - dontUnpack = true; + + # Work around the "unpacker appears to have produced no directories" + # case that happens when the archive doesn't have a subdirectory. + setSourceRoot = "sourceRoot=`pwd`"; + + nativeBuildInputs = [ unzip ]; installPhase = '' - install -Dm755 $src $out/bin/TabNine + install -Dm755 TabNine $out/bin/TabNine ''; meta = with lib; { |