From 9ac7d747f5fd9e432ee41bad4c70ee54d9bd393c Mon Sep 17 00:00:00 2001
From: slotThe <soliditsallgood@tuta.io>
Date: Tue, 31 Mar 2020 13:30:11 +0200
Subject: [PATCH] debug-me: update to 1.20190926

---
 srcpkgs/debug-me/files/stack.yaml       |  3 ++-
 srcpkgs/debug-me/patches/ghc8.8.3.patch | 22 ++++++++++++++++++++++
 srcpkgs/debug-me/patches/ghc86.patch    | 11 -----------
 srcpkgs/debug-me/template               |  6 +++---
 4 files changed, 27 insertions(+), 15 deletions(-)
 create mode 100644 srcpkgs/debug-me/patches/ghc8.8.3.patch
 delete mode 100644 srcpkgs/debug-me/patches/ghc86.patch

diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml
index a27574ed080..bedbdedceef 100644
--- a/srcpkgs/debug-me/files/stack.yaml
+++ b/srcpkgs/debug-me/files/stack.yaml
@@ -1,8 +1,9 @@
 packages:
 - '.'
-resolver: lts-14.1
+resolver: lts-15.4
 extra-deps:
 - posix-pty-0.2.1.1
 - graphviz-2999.20.0.3
 - sandi-0.5
+- protobuf-0.2.1.3@sha256:d8ed3c73027c6b7e7583c6a94ee1835beee8a755a875b06bbf51bc667d53ab69,3048
 allow-newer: true
diff --git a/srcpkgs/debug-me/patches/ghc8.8.3.patch b/srcpkgs/debug-me/patches/ghc8.8.3.patch
new file mode 100644
index 00000000000..f1779331c5a
--- /dev/null
+++ b/srcpkgs/debug-me/patches/ghc8.8.3.patch
@@ -0,0 +1,22 @@
+--- Val.hs	2020-03-31 11:00:33.329814064 +0200
++++ Val.hs	2020-03-31 11:00:24.602711845 +0200
+@@ -42,7 +42,7 @@
+ b64 :: B.ByteString -> T.Text
+ b64 = T.decodeUtf8 . B64.encode
+
+-unb64 :: Monad m => T.Text -> m B.ByteString
++unb64 :: MonadFail m => T.Text -> m B.ByteString
+ unb64 t = either
+ 	(\_ -> fail "bad base64 data")
+ 	return
+--- Server.hs	2020-03-31 12:53:45.860509650 +0200
++++ Server.hs	2020-03-31 12:52:34.873835069 +0200
+@@ -105,7 +105,7 @@
+ 		-- (Workaround for
+ 		-- https://github.com/jaspervdj/websockets/issues/140)
+ 		setHost "*6" $
+-		setPort (serverPort o) $
++		setPort (CmdLine.serverPort o) $
+ 		defaultSettings
+
+ checkEnv :: ServerOpts -> IO ServerOpts
diff --git a/srcpkgs/debug-me/patches/ghc86.patch b/srcpkgs/debug-me/patches/ghc86.patch
deleted file mode 100644
index 176a67f426e..00000000000
--- a/srcpkgs/debug-me/patches/ghc86.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Role/User.hs
-+++ Role/User.hs
-@@ -247,7 +247,7 @@ getDeveloperMessage ichan ochan us now = maybe
- getDeveloperMessage' :: MissingHashes (Message Entered) -> TMChan (Message Seen) -> TVar UserState -> POSIXTime -> STM Input
- getDeveloperMessage' (MissingHashes wiremsg) ochan us now = do
- 	st <- readTVar us
--	Developer msg <- restoreHashes (userStateRecentActivity us) (MissingHashes (Developer wiremsg))
-+	~(Developer msg) <- restoreHashes (userStateRecentActivity us) (MissingHashes (Developer wiremsg))
- 	case msg of
- 		ControlMessage (Control (SessionKey spk _) _) -> do
- 			let sigverifier = mkSigVerifier $ case spk of
diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template
index a0c2ff7af23..0e18fee38b5 100644
--- a/srcpkgs/debug-me/template
+++ b/srcpkgs/debug-me/template
@@ -1,7 +1,7 @@
 # Template file for 'debug-me'
 pkgname=debug-me
-version=1.20181208
-revision=3
+version=1.20190926
+revision=1
 build_style=haskell-stack
 makedepends="zlib-devel"
 short_desc="Secure remote debugging"
@@ -9,7 +9,7 @@ maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="AGPL-3.0-or-later"
 homepage="https://debug-me.branchable.com/"
 distfiles="https://git.joeyh.name/index.cgi/${pkgname}.git/snapshot/${pkgname}-${version}.tar.gz"
-checksum=47cd1f5af1d32b2659c0991466f1ffec34b01211a663b8b0a51ebc2ecb49168b
+checksum=bfce3ded4897a2939d68ae9082be30c34bc21bb5b44b744a4417cc87252e8195
 nocross=yes # Can't yet cross compile Haskell
 nopie_files="/usr/bin/debug-me"