Fix build with recent devel/hs-hashable

3 files changed, 17 insertions, 93 deletions

diff --git a/devel/hs-uniplate/PLIST b/devel/hs-uniplate/PLIST
deleted file mode 100644
index f942df6e99b..00000000000
--- a/devel/hs-uniplate/PLIST
+++ /dev/null
@@ -1,92 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1 2014/07/26 21:50:10 szptvlfn Exp $
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/Data/Generics/Biplate.hi
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/Data/Generics/Compos.hi
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/Data/Generics/PlateData.hi
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/Data/Generics/PlateDirect.hi
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/Data/Generics/PlateTypeable.hi
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/Data/Generics/SYB.hi
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/Data/Generics/Str.hi
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/Data/Generics/Uniplate.hi
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/Data/Generics/Uniplate/Data.hi
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/Data/Generics/Uniplate/Data/Instances.hi
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/Data/Generics/Uniplate/DataOnly.hi
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/Data/Generics/Uniplate/Direct.hi
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/Data/Generics/Uniplate/Internal/Data.hi
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/Data/Generics/Uniplate/Internal/DataOnlyOperations.hi
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/Data/Generics/Uniplate/Internal/Utils.hi
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/Data/Generics/Uniplate/Operations.hi
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/Data/Generics/Uniplate/Typeable.hi
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/Data/Generics/Uniplate/Zipper.hi
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/Data/Generics/UniplateOn.hi
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/Data/Generics/UniplateStr.hi
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/Data/Generics/UniplateStrOn.hi
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/HSuniplate-${PKGVERSION}.o
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/libHSuniplate-${PKGVERSION}.a
-lib/uniplate-${PKGVERSION}/${HASKELL_VERSION}/package-description
-share/doc/uniplate-${PKGVERSION}/LICENSE
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/Data-Generics-Biplate.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/Data-Generics-Compos.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/Data-Generics-PlateData.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/Data-Generics-PlateDirect.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/Data-Generics-PlateTypeable.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/Data-Generics-SYB.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/Data-Generics-Str.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/Data-Generics-Uniplate-Data-Instances.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/Data-Generics-Uniplate-Data.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/Data-Generics-Uniplate-DataOnly.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/Data-Generics-Uniplate-Direct.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/Data-Generics-Uniplate-Operations.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/Data-Generics-Uniplate-Typeable.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/Data-Generics-Uniplate-Zipper.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/Data-Generics-Uniplate.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/Data-Generics-UniplateOn.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/Data-Generics-UniplateStr.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/Data-Generics-UniplateStrOn.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/doc-index-124.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/doc-index-All.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/doc-index-B.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/doc-index-C.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/doc-index-D.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/doc-index-E.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/doc-index-F.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/doc-index-G.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/doc-index-H.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/doc-index-I.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/doc-index-L.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/doc-index-M.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/doc-index-O.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/doc-index-P.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/doc-index-R.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/doc-index-S.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/doc-index-T.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/doc-index-U.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/doc-index-Z.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/doc-index.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/frames.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/haddock-util.js
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/hslogo-16.png
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/index-frames.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/index.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/mini_Data-Generics-Biplate.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/mini_Data-Generics-Compos.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/mini_Data-Generics-PlateData.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/mini_Data-Generics-PlateDirect.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/mini_Data-Generics-PlateTypeable.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/mini_Data-Generics-SYB.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/mini_Data-Generics-Str.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/mini_Data-Generics-Uniplate-Data-Instances.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/mini_Data-Generics-Uniplate-Data.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/mini_Data-Generics-Uniplate-DataOnly.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/mini_Data-Generics-Uniplate-Direct.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/mini_Data-Generics-Uniplate-Operations.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/mini_Data-Generics-Uniplate-Typeable.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/mini_Data-Generics-Uniplate-Zipper.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/mini_Data-Generics-Uniplate.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/mini_Data-Generics-UniplateOn.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/mini_Data-Generics-UniplateStr.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/mini_Data-Generics-UniplateStrOn.html
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/minus.gif
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/ocean.css
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/plus.gif
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/synopsis.png
-${PLIST.doc}share/doc/uniplate-${PKGVERSION}/html/uniplate.haddock
diff --git a/devel/hs-uniplate/distinfo b/devel/hs-uniplate/distinfo
index e1302d4edcb..342e0fe0196 100644
--- a/devel/hs-uniplate/distinfo
+++ b/devel/hs-uniplate/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 03:27:34 agc Exp $
+$NetBSD: distinfo,v 1.3 2020/01/02 09:18:48 pho Exp $
 
 SHA1 (uniplate-1.6.12.tar.gz) = a26cd8ff06d8ef2b516ac6a3c1ff39ced278bffa
 RMD160 (uniplate-1.6.12.tar.gz) = 43075b1656cfd53356391a71bc5647030945dfc2
 SHA512 (uniplate-1.6.12.tar.gz) = 049b07e8a57db7e44d91fc9c8dcfb5c49b78a692a730061763cb8bcc4fbc3ed1065bd7a4c337e3d344693df882a0718b6d3bb6a6ea1e7d520a36d252d7038b07
 Size (uniplate-1.6.12.tar.gz) = 30055 bytes
+SHA1 (patch-uniplate.cabal) = c6682f3fca34e74f47d4da9eb9b9799f7aa7dab4
diff --git a/devel/hs-uniplate/patches/patch-uniplate.cabal b/devel/hs-uniplate/patches/patch-uniplate.cabal
new file mode 100644
index 00000000000..488c0ba0301
--- /dev/null
+++ b/devel/hs-uniplate/patches/patch-uniplate.cabal
@@ -0,0 +1,15 @@
+$NetBSD: patch-uniplate.cabal,v 1.1 2020/01/02 09:18:48 pho Exp $
+
+Relax the upper bound on hashable
+
+--- uniplate.cabal.orig	2013-10-26 21:15:52.000000000 +0000
++++ uniplate.cabal
+@@ -56,7 +56,7 @@ library
+     if flag(typeable_fingerprint)
+         build-depends:
+             base >=4.4 && <5, containers, syb,
+-            hashable >= 1.1.2.3 && < 1.3,
++            hashable >= 1.1.2.3,
+             unordered-containers >= 0.2.1 && < 0.3
+     else
+         if flag(separate_syb)