debug-me: update to 1.20181208 and bump stackage
Also fix lint and add patch to compile with current ghc. [ci skip]
This commit is contained in:
parent
104ba8211e
commit
4e4e9c260d
4 changed files with 17 additions and 46 deletions
|
@ -1,6 +1,8 @@
|
|||
packages:
|
||||
- '.'
|
||||
resolver: lts-12.5
|
||||
resolver: lts-13.30
|
||||
extra-deps:
|
||||
- posix-pty-0.2.1.1
|
||||
- graphviz-2999.20.0.3
|
||||
- sandi-0.5
|
||||
allow-newer: true
|
||||
|
|
|
@ -1,42 +0,0 @@
|
|||
--- Crypto.hs 2017-08-10 20:17:59.000000000 +0200
|
||||
+++ Crypto.hs 2018-08-05 17:53:01.058720655 +0200
|
||||
@@ -77,11 +77,11 @@
|
||||
case Ed25519.publicKey pk of
|
||||
CryptoPassed pk' -> SigVerifier 1 (Ed25519.verify pk')
|
||||
CryptoFailed _ -> mempty
|
||||
-
|
||||
+instance Semigroup SigVerifier where
|
||||
+ (SigVerifier na a) <> (SigVerifier nb b) =
|
||||
+ SigVerifier (na+nb) $ \d s -> b d s || a d s
|
||||
instance Monoid SigVerifier where
|
||||
mempty = SigVerifier 0 $ \_b _s -> False
|
||||
- mappend (SigVerifier na a) (SigVerifier nb b) =
|
||||
- SigVerifier (na+nb) $ \d s -> b d s || a d s
|
||||
|
||||
data MySessionKey = MySessionKey Ed25519.SecretKey Ed25519.PublicKey
|
||||
|
||||
--- Types.hs 2017-08-10 20:17:59.000000000 +0200
|
||||
+++ Types.hs 2018-08-05 17:51:29.435490869 +0200
|
||||
@@ -194,9 +194,10 @@
|
||||
mkElapsedTime :: POSIXTime -> POSIXTime -> ElapsedTime
|
||||
mkElapsedTime start end = ElapsedTime $ fromRational $ toRational (end - start)
|
||||
|
||||
+instance Semigroup ElapsedTime where
|
||||
+ (ElapsedTime a) <> (ElapsedTime b) = ElapsedTime (a+b)
|
||||
instance Monoid ElapsedTime where
|
||||
mempty = ElapsedTime 0
|
||||
- mappend (ElapsedTime a) (ElapsedTime b) = ElapsedTime (a+b)
|
||||
|
||||
instance DataSize ElapsedTime where
|
||||
dataSize _ = 16 -- 128 bit Double
|
||||
--- Val.hs 2017-08-10 20:17:59.000000000 +0200
|
||||
+++ Val.hs 2018-08-05 17:50:22.926328293 +0200
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
-- | Newtype of ByteString so we can have JSON instances without orphans.
|
||||
newtype Val = Val { val :: B.ByteString }
|
||||
- deriving (Show, Generic, Eq, Monoid)
|
||||
+ deriving (Show, Generic, Eq, Monoid, Semigroup)
|
||||
|
||||
instance DataSize Val where
|
||||
dataSize (Val b) = fromIntegral (B.length b)
|
11
srcpkgs/debug-me/patches/ghc86.patch
Normal file
11
srcpkgs/debug-me/patches/ghc86.patch
Normal file
|
@ -0,0 +1,11 @@
|
|||
--- 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
|
|
@ -1,16 +1,16 @@
|
|||
# Template file for 'debug-me'
|
||||
pkgname=debug-me
|
||||
version=1.20170810
|
||||
version=1.20181208
|
||||
revision=1
|
||||
build_style=haskell-stack
|
||||
nocross=yes # Can't yet cross compile Haskell
|
||||
makedepends="zlib-devel"
|
||||
short_desc="Secure remote debugging"
|
||||
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=1b884c882b33d6a43193730c414f6344c177a1a00f9fd0fc7b952f3473ed9666
|
||||
checksum=47cd1f5af1d32b2659c0991466f1ffec34b01211a663b8b0a51ebc2ecb49168b
|
||||
nocross=yes # Can't yet cross compile Haskell
|
||||
nopie_files="/usr/bin/debug-me"
|
||||
|
||||
post_install() {
|
||||
|
|
Loading…
Reference in a new issue