From 43277b558669d433243ce812d716daf077246f97 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 24 Oct 2017 00:52:27 +0200
Subject: [PATCH 1/3] cockroachdb: v1.0.5 -> v1.1.1

---
 pkgs/servers/sql/cockroachdb/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix
index a6442b976473..88738188f575 100644
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/pkgs/servers/sql/cockroachdb/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, buildGoPackage, fetchurl, cmake, xz, which }:
+{ stdenv, buildGoPackage, fetchurl, cmake, xz, which, autoconf }:
 
 buildGoPackage rec {
   name = "cockroach-${version}";
-  version = "v1.0.5";
+  version = "v1.1.1";
 
   goPackagePath = "github.com/cockroachdb/cockroach";
 
   src = fetchurl {
     url = "https://binaries.cockroachdb.com/cockroach-${version}.src.tgz";
-    sha256 = "0jjl6zb8pyxws3i020h98vdr217railca8h6n3xijkvcqy9dj8wa";
+    sha256 = "0d2nlm291k4x7hqi0kh76j6pj8b1dwbdww5f95brf0a9bl1n7qxr";
   };
 
-  buildInputs = [ cmake xz which ];
+  nativeBuildInputs = [ cmake xz which autoconf ];
 
   buildPhase =
     ''

From cf84d2ff788ed0eba50d95a33b586e84b4a2b2e8 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Tue, 24 Oct 2017 01:45:57 +0200
Subject: [PATCH 2/3] cockroachdb: enable build on darwin

---
 pkgs/servers/sql/cockroachdb/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix
index 88738188f575..3594cf5c7b00 100644
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/pkgs/servers/sql/cockroachdb/default.nix
@@ -38,7 +38,7 @@ buildGoPackage rec {
     homepage = https://www.cockroachlabs.com;
     description = "A scalable, survivable, strongly-consistent SQL database";
     license = licenses.asl20;
-    platforms = [ "x86_64-linux" ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
     maintainers = [ maintainers.rushmorem ];
   };
 }

From 4432eb0de56b02133633cae01e7ebeb23a75e449 Mon Sep 17 00:00:00 2001
From: Joerg Thalheim <joerg@thalheim.io>
Date: Wed, 25 Oct 2017 09:11:16 +0100
Subject: [PATCH 3/3] cockroachdb: install bash completion into .bin

---
 pkgs/servers/sql/cockroachdb/default.nix | 41 ++++++++++++------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix
index 3594cf5c7b00..be9a02031ffe 100644
--- a/pkgs/servers/sql/cockroachdb/default.nix
+++ b/pkgs/servers/sql/cockroachdb/default.nix
@@ -2,37 +2,36 @@
 
 buildGoPackage rec {
   name = "cockroach-${version}";
-  version = "v1.1.1";
+  version = "1.1.1";
 
   goPackagePath = "github.com/cockroachdb/cockroach";
 
   src = fetchurl {
-    url = "https://binaries.cockroachdb.com/cockroach-${version}.src.tgz";
+    url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz";
     sha256 = "0d2nlm291k4x7hqi0kh76j6pj8b1dwbdww5f95brf0a9bl1n7qxr";
   };
 
   nativeBuildInputs = [ cmake xz which autoconf ];
 
-  buildPhase =
-    ''
-      cd $NIX_BUILD_TOP/go/src/${goPackagePath}
-      patchShebangs ./
-      make buildoss
-      cd src/${goPackagePath}
-      for asset in man autocomplete; do
-        ./cockroach gen $asset
-      done
-    '';
+  buildPhase = ''
+    runHook preBuild
+    cd $NIX_BUILD_TOP/go/src/${goPackagePath}
+    patchShebangs .
+    make buildoss
+    cd src/${goPackagePath}
+    for asset in man autocomplete; do
+      ./cockroach gen $asset
+    done
+    runHook postBuild
+  '';
 
-  installPhase =
-    ''
-      mkdir -p $bin/{bin,share}
-      mv cockroach $bin/bin/
-      mv man $bin/share/
-
-      mkdir -p $out/share/bash-completion/completions
-      mv cockroach.bash $out/share/bash-completion/completions
-    '';
+  installPhase = ''
+    runHook preInstall
+    install -D cockroach $bin/bin/cockroach
+    install -D cockroach.bash $bin/share/bash-completion/completions/cockroach.bash
+    cp -r man $bin/share/man
+    runHook postInstall
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://www.cockroachlabs.com;