diff options
| -rw-r--r-- | pkgs/servers/sql/cockroachdb/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index e97b483fa06..f40a5df0f5c 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "cockroach-${version}"; - version = "1.1.2"; + version = "1.1.5"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "0h1fijzihp85a18flq4brdc3b38gj867kfkp31gncnmff0xb8kam"; + sha256 = "0i2lg60424i1yg9dhapfsy3majnlbad2wlf93d9l161jf5lp9a2d"; }; nativeBuildInputs = [ cmake xz which autoconf ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7007514e97..ba820c41007 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12778,10 +12778,7 @@ with pkgs; cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; - cockroachdb = callPackage ../servers/sql/cockroachdb { - # Go 1.9 build fails with "go1.8.* required (see CONTRIBUTING.md)". - buildGoPackage = buildGo18Package; - }; + cockroachdb = callPackage ../servers/sql/cockroachdb { }; conky = callPackage ../os-specific/linux/conky ({ lua = lua5_1; # conky can use 5.2, but toluapp can not |