Merge pull request #62601 from rvolosatovs/update/cockroachdb

cockroachdb: 1.19.0 -> 1.19.1
This commit is contained in:
Mario Rodas 2019-06-04 08:12:35 -05:00 committed by GitHub
commit ca4f7e0518
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 8 deletions

View File

@ -13,13 +13,13 @@ let
in in
buildGoPackage rec { buildGoPackage rec {
name = "cockroach-${version}"; name = "cockroach-${version}";
version = "19.1.0"; version = "19.1.1";
goPackagePath = "github.com/cockroachdb/cockroach"; goPackagePath = "github.com/cockroachdb/cockroach";
src = fetchurl { src = fetchurl {
url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz";
sha256 = "1kb93jxgxc54c23v72ka116b2j7m82c1jghm7njd64qkbbcgrkkw"; sha256 = "1vbz5j0y9ri8c99k8fc5rnwigay478p1mac5g402639ilkqd41fc";
}; };
inherit nativeBuildInputs buildInputs; inherit nativeBuildInputs buildInputs;
@ -59,6 +59,6 @@ buildGoPackage rec {
description = "A scalable, survivable, strongly-consistent SQL database"; description = "A scalable, survivable, strongly-consistent SQL database";
license = licenses.asl20; license = licenses.asl20;
platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
maintainers = with maintainers; [ rushmorem thoughtpolice ]; maintainers = with maintainers; [ rushmorem thoughtpolice rvolosatovs ];
}; };
} }

View File

@ -14947,11 +14947,7 @@ in
cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; cifs-utils = callPackage ../os-specific/linux/cifs-utils { };
cockroachdb = callPackage ../servers/sql/cockroachdb { cockroachdb = callPackage ../servers/sql/cockroachdb { };
# XXX: this is failing with Go 1.12. Error is related to cgo, an
# update to this package might fix it.
buildGoPackage = buildGo111Package;
};
conky = callPackage ../os-specific/linux/conky ({ conky = callPackage ../os-specific/linux/conky ({
lua = lua5_3_compat; lua = lua5_3_compat;