From 566d221c9aa51576999e9b42bc69b82ba6d4844e Mon Sep 17 00:00:00 2001 From: pho Date: Fri, 11 Feb 2022 09:05:12 +0000 Subject: Fix build with GHC 9.2 --- security/hs-ed25519/distinfo | 4 ++-- security/hs-ed25519/patches/patch-ed25519.cabal | 31 +++++++++++++++++++++---- 2 files changed, 28 insertions(+), 7 deletions(-) (limited to 'security') diff --git a/security/hs-ed25519/distinfo b/security/hs-ed25519/distinfo index 8efb15d9381..95a10b5e6f1 100644 --- a/security/hs-ed25519/distinfo +++ b/security/hs-ed25519/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2021/10/26 11:17:09 nia Exp $ +$NetBSD: distinfo,v 1.5 2022/02/11 09:05:12 pho Exp $ BLAKE2s (ed25519-0.0.5.0.tar.gz) = 33d672eea2ed5c0342c9de6ebf18ac5a7ea9dd100cc18bd7d2678955daf85fcb SHA512 (ed25519-0.0.5.0.tar.gz) = cd2bb28de905c6d659f80f15e82970a9634c959432c73b6fd3b10ebca42a1ce734429e7ac861d0ab328904d99651a6d2fcaaf4d74ab75a3c0be68607e8f54ce9 Size (ed25519-0.0.5.0.tar.gz) = 80034 bytes -SHA1 (patch-ed25519.cabal) = e5989fa52c3b59d7ce459ca7358df8e086ef5120 +SHA1 (patch-ed25519.cabal) = e478e7eb804875353eb06582dbf229c60e485614 diff --git a/security/hs-ed25519/patches/patch-ed25519.cabal b/security/hs-ed25519/patches/patch-ed25519.cabal index 630b57d7896..2cb57866106 100644 --- a/security/hs-ed25519/patches/patch-ed25519.cabal +++ b/security/hs-ed25519/patches/patch-ed25519.cabal @@ -1,15 +1,36 @@ -$NetBSD: patch-ed25519.cabal,v 1.2 2021/04/24 13:21:53 pho Exp $ +$NetBSD: patch-ed25519.cabal,v 1.3 2022/02/11 09:05:12 pho Exp $ -Fix build with GHC 9. +Fix build with GHC 9.2. --- ed25519.cabal.orig 2015-10-11 23:24:33.000000000 +0000 +++ ed25519.cabal -@@ -60,7 +60,7 @@ flag no-donna +@@ -60,9 +60,9 @@ flag no-donna library build-depends: - ghc-prim >= 0.1 && < 0.5, -+ ghc-prim >= 0.1 && < 0.8, ++ ghc-prim >= 0.1 && < 0.9, base >= 4 && < 5, - bytestring >= 0.9 && < 0.11 +- bytestring >= 0.9 && < 0.11 ++ bytestring >= 0.9 && < 0.12 + exposed-modules: + Crypto.Sign.Ed25519 +@@ -96,7 +96,7 @@ test-suite properties + else + build-depends: + base >= 4 && < 5, +- bytestring >= 0.9 && < 0.11, ++ bytestring >= 0.9 && < 0.12, + QuickCheck >= 2.4 && < 2.9, + ed25519 + +@@ -139,7 +139,7 @@ benchmark bench + type: exitcode-stdio-1.0 + build-depends: + base >= 4 && < 5, +- bytestring >= 0.9 && < 0.11, ++ bytestring >= 0.9 && < 0.12, + criterion >= 0.8 && < 1.2, + deepseq >= 1.3 && < 1.5, + ed25519 -- cgit v1.2.3