From 36682c25cfe5e4fabd148d7f3291d06dbe1df656 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Sun, 18 Oct 2020 01:02:23 +0100
Subject: [PATCH] Add new gopkgs for twitterchiver viewer.

---
 .../github.com/google/safehtml/default.nix      | 17 +++++++++++++++++
 third_party/gopkgs/github.com/jackc/default.nix |  8 --------
 .../gopkgs/github.com/jackc/pgx/v4/default.nix  |  1 +
 .../gopkgs/github.com/jackc/puddle/default.nix  | 15 +++++++++++++++
 4 files changed, 33 insertions(+), 8 deletions(-)
 create mode 100644 third_party/gopkgs/github.com/google/safehtml/default.nix
 delete mode 100644 third_party/gopkgs/github.com/jackc/default.nix
 create mode 100644 third_party/gopkgs/github.com/jackc/puddle/default.nix

diff --git a/third_party/gopkgs/github.com/google/safehtml/default.nix b/third_party/gopkgs/github.com/google/safehtml/default.nix
new file mode 100644
index 0000000000..afc5d861d1
--- /dev/null
+++ b/third_party/gopkgs/github.com/google/safehtml/default.nix
@@ -0,0 +1,17 @@
+# SPDX-FileCopyrightText: 2020 Luke Granger-Brown <depot@lukegb.com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
+{ depot, ... }:
+depot.third_party.buildGo.external {
+  path = "github.com/google/safehtml";
+  src = depot.third_party.nixpkgs.fetchFromGitHub {
+    owner = "google";
+    repo = "safehtml";
+    rev = "84376441970934a68e39214e319511a596b8d015";
+    hash = "sha256:0w25d86rz7afrnk349g6qsdf0fglsazrr1xzxgaw44rqj315wqf2";
+  };
+  deps = [
+    depot.third_party.gopkgs."golang.org".x.text.unicode.rangetable
+  ];
+}
diff --git a/third_party/gopkgs/github.com/jackc/default.nix b/third_party/gopkgs/github.com/jackc/default.nix
deleted file mode 100644
index 27bd54fd2f..0000000000
--- a/third_party/gopkgs/github.com/jackc/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-FileCopyrightText: 2020 Luke Granger-Brown <depot@lukegb.com>
-#
-# SPDX-License-Identifier: Apache-2.0
-
-args: {
-  pgconn = import ./pgconn args;
-  pgx = import ./pgx args;
-}
diff --git a/third_party/gopkgs/github.com/jackc/pgx/v4/default.nix b/third_party/gopkgs/github.com/jackc/pgx/v4/default.nix
index 95983cdd2e..f60fefbe99 100644
--- a/third_party/gopkgs/github.com/jackc/pgx/v4/default.nix
+++ b/third_party/gopkgs/github.com/jackc/pgx/v4/default.nix
@@ -17,6 +17,7 @@ depot.third_party.buildGo.external {
     depot.third_party.gopkgs."github.com".jackc.pgio
     depot.third_party.gopkgs."github.com".jackc.pgproto3.v2
     depot.third_party.gopkgs."github.com".jackc.pgtype
+    depot.third_party.gopkgs."github.com".jackc.puddle
     depot.third_party.gopkgs."golang.org".x.xerrors
   ];
 }
diff --git a/third_party/gopkgs/github.com/jackc/puddle/default.nix b/third_party/gopkgs/github.com/jackc/puddle/default.nix
new file mode 100644
index 0000000000..51ffc28b55
--- /dev/null
+++ b/third_party/gopkgs/github.com/jackc/puddle/default.nix
@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: 2020 Luke Granger-Brown <depot@lukegb.com>
+#
+# SPDX-License-Identifier: Apache-2.0
+
+{ depot, ... }:
+depot.third_party.buildGo.external {
+  path = "github.com/jackc/puddle";
+  src = depot.third_party.nixpkgs.fetchFromGitHub {
+    owner = "jackc";
+    repo = "puddle";
+    rev = "8a2237ffa5d713d0bb0c8af2792cb4fa1ce89729";
+    hash = "sha256:1l7lvlm4jv3ikgmppwzz5xcxzdqv18yx0vgq5qfaqifaags0cjvd";
+  };
+  deps = [];
+}