public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot] 2021-01-07 12:27:10 +00:00 committed by GitHub
commit a544214cae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/database/timescaledb-tune/default.nix
View File

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "timescaledb-tune"; pname = "timescaledb-tune";
version = "0.9.0"; version = "0.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "timescale"; owner = "timescale";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "0vncwwvw7y6g3crd4n5vvd6jwdsa8vsvsmfwy5mad4j6lix09ajx"; sha256 = "0vrbbswmg6z3n012mqd1jasqk01navypzv5m00r6c9bxj72hgcxl";
}; };
vendorSha256 = "0hbpprbxs19fcar7xcy42kn9yfzhal2zsv5pml9ghiv2s61yns4z"; vendorSha256 = "0hbpprbxs19fcar7xcy42kn9yfzhal2zsv5pml9ghiv2s61yns4z";

21
pkgs/development/tools/tabnine/default.nix
View File

@ -1,17 +1,17 @@
{ stdenv, lib, fetchurl }: { stdenv, lib, fetchurl, unzip }:
let let
version = "3.1.1"; version = "3.2.63";
src = src =
if stdenv.hostPlatform.system == "x86_64-darwin" then if stdenv.hostPlatform.system == "x86_64-darwin" then
fetchurl { fetchurl {
url = "https://update.tabnine.com/${version}/x86_64-apple-darwin/TabNine"; url = "https://update.tabnine.com/bundles/${version}/x86_64-apple-darwin/TabNine.zip";
sha256 = "w+Ufy4pICfQmseKCeohEQIP0VD6YrkYTEn41HX40Zlw="; sha256 = "0y0wb3jdr2qk4k21c11w8c9a5fl0h2rm1wm7m8hqdywy4lz9ppgy";
} }
else if stdenv.hostPlatform.system == "x86_64-linux" then else if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl { fetchurl {
url = "https://update.tabnine.com/${version}/x86_64-unknown-linux-musl/TabNine"; url = "https://update.tabnine.com/bundles/${version}/x86_64-unknown-linux-musl/TabNine.zip";
sha256 = "hSltZWQz2BRFut0NDI4fS/N8XxFJaYGHRtV3llBVOY4="; sha256 = "0zzk2w5azk5f0svjxlj2774x01xdflb767xxvbglj4223dgyx2x5";
} }
else throw "Not supported on ${stdenv.hostPlatform.system}"; else throw "Not supported on ${stdenv.hostPlatform.system}";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
@ -20,10 +20,15 @@ in stdenv.mkDerivation rec {
inherit version src; inherit version src;
dontBuild = true; 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 = '' installPhase = ''
install -Dm755 $src $out/bin/TabNine install -Dm755 TabNine $out/bin/TabNine
''; '';
meta = with lib; { meta = with lib; {