diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2019-06-04 08:12:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-04 08:12:35 -0500 |
| commit | ca4f7e0518f66d32c0ebcc2930aba219568aaeed (patch) | |
| tree | b71c3265b7194a714fd87cb1ed001df4896c91c1 | |
| parent | d1cd9ff16c30567565c17992285e49b75b754bf1 (diff) | |
| parent | b906a4113366c2eb09a25c643a2d08e11442ed92 (diff) | |
Merge pull request #62601 from rvolosatovs/update/cockroachdb
cockroachdb: 1.19.0 -> 1.19.1
| -rw-r--r-- | pkgs/servers/sql/cockroachdb/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 241ca9235c64..22ec301bceda 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -13,13 +13,13 @@ let in buildGoPackage rec { name = "cockroach-${version}"; - version = "19.1.0"; + version = "19.1.1"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "1kb93jxgxc54c23v72ka116b2j7m82c1jghm7njd64qkbbcgrkkw"; + sha256 = "1vbz5j0y9ri8c99k8fc5rnwigay478p1mac5g402639ilkqd41fc"; }; inherit nativeBuildInputs buildInputs; @@ -59,6 +59,6 @@ buildGoPackage rec { description = "A scalable, survivable, strongly-consistent SQL database"; license = licenses.asl20; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ rushmorem thoughtpolice ]; + maintainers = with maintainers; [ rushmorem thoughtpolice rvolosatovs ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3605dcbe54e..7589bc50e3fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14947,11 +14947,7 @@ in cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; - 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; - }; + cockroachdb = callPackage ../servers/sql/cockroachdb { }; conky = callPackage ../os-specific/linux/conky ({ lua = lua5_3_compat; |