diff --git a/srcpkgs/debug-me/files/stack.yaml b/srcpkgs/debug-me/files/stack.yaml new file mode 100644 index 00000000000..93e6e39abcd --- /dev/null +++ b/srcpkgs/debug-me/files/stack.yaml @@ -0,0 +1,6 @@ +packages: +- '.' +resolver: lts-12.5 +extra-deps: +- posix-pty-0.2.1.1 +allow-newer: true diff --git a/srcpkgs/debug-me/patches/ghc84.patch b/srcpkgs/debug-me/patches/ghc84.patch new file mode 100644 index 00000000000..b77e35033cb --- /dev/null +++ b/srcpkgs/debug-me/patches/ghc84.patch @@ -0,0 +1,42 @@ +--- 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) diff --git a/srcpkgs/debug-me/template b/srcpkgs/debug-me/template index 44aec18dbc1..fbb77b9fada 100644 --- a/srcpkgs/debug-me/template +++ b/srcpkgs/debug-me/template @@ -1,14 +1,18 @@ # Template file for 'debug-me' pkgname=debug-me -version=1.20170520 +version=1.20170810 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 " -license="AGPL-3" +license="AGPL-3.0-or-later" homepage="https://debug-me.branchable.com/" -nopie=yes # network-2.6.3.1 build fails with a relocation distfiles="https://git.joeyh.name/index.cgi/${pkgname}.git/snapshot/${pkgname}-${version}.tar.gz" -checksum=efafaf57e575e454ad0e46664d1fa07a34608f4a1faaf3e0d2a3537ed2c63131 +checksum=1b884c882b33d6a43193730c414f6344c177a1a00f9fd0fc7b952f3473ed9666 +nopie_files="/usr/bin/debug-me" + +post_install() { + vlicense AGPL +}