CVS commit: pkgsrc/lang/dhall

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Sep  1 09:25:19 UTC 2022

Modified Files:
        pkgsrc/lang/dhall: distinfo
        pkgsrc/lang/dhall/patches: patch-dhall.cabal

Log Message:
ll: fix build with current pkgsrc versions of dependencies


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/dhall/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/dhall/patches/patch-dhall.cabal

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/dhall/distinfo
diff -u pkgsrc/lang/dhall/distinfo:1.1 pkgsrc/lang/dhall/distinfo:1.2
--- pkgsrc/lang/dhall/distinfo:1.1      Wed Feb 23 16:58:29 2022
+++ pkgsrc/lang/dhall/distinfo  Thu Sep  1 09:25:18 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2022/02/23 16:58:29 pho Exp $
+$NetBSD: distinfo,v 1.2 2022/09/01 09:25:18 wiz Exp $
 
 BLAKE2s (dhall-1.40.2.tar.gz) = e169ce61dd764dfc2ff00626bf72404ec7edd0dd469d175eb386b113a228dbad
 SHA512 (dhall-1.40.2.tar.gz) = c4015eb3632ef7b75988bccef4043a835b6e031496860e9339473970819cc2c62ef1becf1bfcc923be85e434befb7b0e64b3d0820f11b1999955ffb92df904ac
 Size (dhall-1.40.2.tar.gz) = 630386 bytes
-SHA1 (patch-dhall.cabal) = c7aae6a31bf9ef4ecdb8d9ce0305abf9c5956abb
+SHA1 (patch-dhall.cabal) = 6c0e588e83d72b4905f30e90d8368ac5c963c8e7

Index: pkgsrc/lang/dhall/patches/patch-dhall.cabal
diff -u pkgsrc/lang/dhall/patches/patch-dhall.cabal:1.1 pkgsrc/lang/dhall/patches/patch-dhall.cabal:1.2
--- pkgsrc/lang/dhall/patches/patch-dhall.cabal:1.1     Wed Feb 23 16:58:29 2022
+++ pkgsrc/lang/dhall/patches/patch-dhall.cabal Thu Sep  1 09:25:18 2022
@@ -1,9 +1,18 @@
-$NetBSD: patch-dhall.cabal,v 1.1 2022/02/23 16:58:29 pho Exp $
+$NetBSD: patch-dhall.cabal,v 1.2 2022/09/01 09:25:18 wiz Exp $
 
-Fix build with optparse-applicative-0.17
+Fix build with optparse-applicative-0.17, aeson 2.1 and vector 0.14.
 
 --- dhall.cabal.orig   2001-09-09 01:46:40.000000000 +0000
 +++ dhall.cabal
+@@ -473,7 +473,7 @@ Library
+     Hs-Source-Dirs: src
+     Build-Depends:
+         base                        >= 4.11.0.0 && < 5   ,
+-        aeson                       >= 1.0.0.0  && < 2.1 ,
++        aeson                       >= 1.0.0.0,
+         aeson-pretty                               < 0.9 ,
+         ansi-terminal               >= 0.6.3.1  && < 0.12,
+         atomic-write                >= 0.2.0.7  && < 0.3 ,
 @@ -501,7 +501,7 @@ Library
          mmorph                                     < 1.3 ,
          mtl                         >= 2.2.1    && < 2.3 ,
@@ -13,3 +22,12 @@ Fix build with optparse-applicative-0.17
          parsers                     >= 0.12.4   && < 0.13,
          parser-combinators                               ,
          prettyprinter               >= 1.7.0    && < 1.8 ,
+@@ -519,7 +519,7 @@ Library
+         transformers                >= 0.5.2.0  && < 0.6 ,
+         unordered-containers        >= 0.1.3.0  && < 0.3 ,
+         uri-encode                                 < 1.6 ,
+-        vector                      >= 0.11.0.0 && < 0.13
++        vector                      >= 0.11.0.0
+     if flag(with-http)
+       CPP-Options:
+         -DWITH_HTTP