summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2018-04-18 00:40:17 +0100
committerGitHub <noreply@github.com>2018-04-18 00:40:17 +0100
commit329ca7db6cfd1d9529873c9a66f6f44be5af22bc (patch)
tree8e72c20c804b7a5d7bdab7bfb7601ebd212c8ff7 /pkgs
parentd60a4a3b05c541e3d793572b5c2eb19a9687dfdd (diff)
parent4707e69aac4456a19611a3754bd1f0c5251113e5 (diff)
downloadnixpkgs-329ca7db6cfd1d9529873c9a66f6f44be5af22bc.tar
nixpkgs-329ca7db6cfd1d9529873c9a66f6f44be5af22bc.tar.gz
nixpkgs-329ca7db6cfd1d9529873c9a66f6f44be5af22bc.tar.bz2
nixpkgs-329ca7db6cfd1d9529873c9a66f6f44be5af22bc.tar.lz
nixpkgs-329ca7db6cfd1d9529873c9a66f6f44be5af22bc.tar.xz
nixpkgs-329ca7db6cfd1d9529873c9a66f6f44be5af22bc.tar.zst
nixpkgs-329ca7db6cfd1d9529873c9a66f6f44be5af22bc.zip
Merge pull request #38662 from jbboehr/cockroach-2_master
cockroachdb: 1.1.5 -> 2.0.0
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/servers/sql/cockroachdb/default.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix
index f40a5df0f5c..aba997d75f1 100644
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/pkgs/servers/sql/cockroachdb/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, buildGoPackage, fetchurl, cmake, xz, which, autoconf }:
+{ stdenv, buildGoPackage, fetchurl, cmake, xz, which, autoconf, ncurses6, libedit }:
 
 buildGoPackage rec {
   name = "cockroach-${version}";
-  version = "1.1.5";
+  version = "2.0.0";
 
   goPackagePath = "github.com/cockroachdb/cockroach";
 
   src = fetchurl {
     url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz";
-    sha256 = "0i2lg60424i1yg9dhapfsy3majnlbad2wlf93d9l161jf5lp9a2d";
+    sha256 = "0x8hf5qwvgb2w6dcnvy20v77nf19f0l1pb40jf31rm72xhk3bwvy";
   };
 
+  buildInputs = [ (if stdenv.isDarwin then libedit else ncurses6) ];
   nativeBuildInputs = [ cmake xz which autoconf ];
 
   buildPhase = ''