From 7a32a52ad0a7f1f68d0505072db68d6878a7d763 Mon Sep 17 00:00:00 2001 From: slotThe Date: Thu, 24 Mar 2022 11:50:45 +0100 Subject: [PATCH] debug-me: update to 1.20220324 --- srcpkgs/debug-me/files/stack.yaml | 8 +++--- srcpkgs/debug-me/patches/ghc8.10.4.patch | 33 ------------------------ srcpkgs/debug-me/template | 7 ++--- 3 files changed, 7 insertions(+), 41 deletions(-) delete mode 100644 srcpkgs/debug-me/patches/ghc8.10.4.patch diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml index ad8b055bb33..f2b1a79d70c 100644 --- a/srcpkgs/debug-me/files/stack.yaml +++ b/srcpkgs/debug-me/files/stack.yaml @@ -1,8 +1,6 @@ packages: - '.' -resolver: lts-18.14 +resolver: lts-19.0 extra-deps: -- posix-pty-0.2.1.1 -- graphviz-2999.20.1.0 -- sandi-0.5 -- protobuf-0.2.1.3@sha256:d8ed3c73027c6b7e7583c6a94ee1835beee8a755a875b06bbf51bc667d53ab69,3048 + - posix-pty-0.2.1.1 + - sandi-0.5@sha256:b278d072ca717706ea38f9bd646e023f7f2576a778fb43565b434f93638849aa,3010 diff --git a/srcpkgs/debug-me/patches/ghc8.10.4.patch b/srcpkgs/debug-me/patches/ghc8.10.4.patch deleted file mode 100644 index bfcff16a443..00000000000 --- a/srcpkgs/debug-me/patches/ghc8.10.4.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/Val.hs 2020-03-31 11:00:33.329814064 +0200 -+++ b/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 ---- a/Server.hs 2020-03-31 12:53:45.860509650 +0200 -+++ b/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 ---- a/debug-me.cabal -+++ b/debug-me.cabal -@@ -64,7 +64,7 @@ - , stm-chans (>= 3.0) - , posix-pty (>= 0.2.1) - , terminal-size (>= 0.3) -- , aeson (>= 0.11 && < 1.5) -+ , aeson (>= 0.11 && < 1.6) - , sandi (>= 0.4) - , text (>= 1.2.2) - , optparse-applicative (>= 0.12) diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template index 86ac0037311..f971f2156c7 100644 --- a/srcpkgs/debug-me/template +++ b/srcpkgs/debug-me/template @@ -1,15 +1,16 @@ # Template file for 'debug-me' pkgname=debug-me -version=1.20200820 -revision=3 +version=1.20220324 +revision=1 build_style=haskell-stack +stackage="lts-19.0" makedepends="zlib-devel" short_desc="Secure remote debugging" maintainer="Dominic Monroe " 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=9497dc9b85a58e5c499ea25fa1bed9f4fd6cdd2f57564f52a0e4152ad4fdc102 +checksum=9fd6256aa34408106ff095e0560850aca3558a774be4ce19de6ab6e81fbfdb9f nocross=yes # Can't yet cross compile Haskell nopie_files="/usr/bin/debug-me"