From 4bd817b82aaf4a46eba9f2d842aa102b57f03c70 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 2 Sep 2015 22:17:45 -0700
Subject: [PATCH] pond: Migrate to go-packages

---
 pkgs/applications/networking/pond/default.nix | 30 -------------------
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 11 +++++++
 3 files changed, 12 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/applications/networking/pond/default.nix

diff --git a/pkgs/applications/networking/pond/default.nix b/pkgs/applications/networking/pond/default.nix
deleted file mode 100644
index 21d99013a1a0..000000000000
--- a/pkgs/applications/networking/pond/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, goPackages, fetchgit, trousers }:
-
-with goPackages;
-
-buildGoPackage rec {
-  rev = "f4e441c77a2039814046ff8219629c547fe8b689";
-  name = "pond-${lib.strings.substring 0 7 rev}";
-  goPackagePath = "github.com/agl/pond";
-  src = fetchgit {
-    inherit rev;
-    url = "git://github.com/agl/pond.git";
-    sha256 = "f2dfc6cb96cc4b8ae732e41d1958b62036f40cb346df2e14f27b5964a1416026";
-  };
-
-  subPackages = [ "client" ];
-
-  buildInputs = [ trousers net crypto protobuf ed25519 govers ];
-    
-  buildFlags = "--tags nogui";
-
-  dontInstallSrc = true;
-
-  meta = with lib; {
-    description = "Forward secure, asynchronous messaging for the discerning";
-    homepage = https://pond.imperialviolet.org;
-    license = licenses.bsd3;
-    platforms = platforms.linux;
-  };
-}
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ed91ee05b4c..bc1067d88cd6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12543,7 +12543,7 @@ let
     inherit (xorg) libXpm;
   };
 
-  pond = callPackage ../applications/networking/pond { };
+  pond = goPackages.pond.bin // { outputs = [ "bin" ]; };
 
   ponymix = callPackage ../applications/audio/ponymix { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 052e0fce8e50..ea3dcd6a279f 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1969,6 +1969,17 @@ let
     doCheck = false; # bad import path in tests
   };
 
+  pond = buildFromGitHub {
+    rev = "bce6e0dc61803c23699c749e29a83f81da3c41b2";
+    owner = "agl";
+    repo = "pond";
+    sha256 = "1dmgbg4ak3jkbgmxh0lr4hga1nl623mh7pvsgby1rxl4ivbzwkh4";
+
+    buildInputs = [ net crypto protobuf ed25519 pkgs.trousers pkgs.dclxvi ];
+    buildFlags = "-tags nogui";
+    excludedPackages = "appengine";
+  };
+
   pongo2 = buildFromGitHub {
     rev    = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9";
     date   = "2014-10-27";