Thu Jan 26 15:08:26 2023 UTC ()
devel/hs-fsnotify: Update to 0.4.1.0

Version 0.4.1.0
* Add unliftio lower bound (#106)
* Change the tests back to a test-suite to avoid building for library
  users. (#107)
* Fix up Windows compatibility.
* Export WatchConfig type (#108)

Version 0.4.0.1
* Fix compatibility with *BSD.

Version 0.4.0.0
API breaking update.
* New options for threading control (single-threaded, thread-per-watch, and
  thread-per-manager)
* Revamp WatchConfig options to be less confusing and reduce boolean
  blindness.
* Pull out debouncing stuff, since it was never correct as it simply took
  the last event affecting a given file in the debounce period. Debouncing
  is currently not included, and should be handled as an orthogonal
  concern. I'd like to include some debouncing logic, but didn't want to
  delay this release any longer.
  - We now expose type DebounceFn = Action -> IO Action, which represents
    an arbitrary debouncer. All debouncers should be in the form of one of
    these functions.
  - A robust state machine debouncer is in progress but not fully
    implemented yet; see the state-machine branch.
  - Contributions are welcome! We can potentially add multiple debouncers
    of different complexity as modules under System.FSNotify.Debounce.*.
* Don't silently fall back to polling on failure of native
  watcher. Instead, throw an exception which the user can recover from by
  switching to polling.
* Add ModifiedAttributes event type + Linux support
* Add confOnHandlerException to be able to control what happens when a
  handler throws an exception.
* WatchConfig constructor is no longer exposed. Instead use defaultConfig
  {...} with the accessors.


(pho)
diff -r1.6 -r1.7 pkgsrc/devel/hs-fsnotify/Makefile
diff -r1.6 -r1.7 pkgsrc/devel/hs-fsnotify/buildlink3.mk
diff -r1.1 -r1.2 pkgsrc/devel/hs-fsnotify/PLIST.common
diff -r1.1 -r1.2 pkgsrc/devel/hs-fsnotify/PLIST.inotify
diff -r1.4 -r1.5 pkgsrc/devel/hs-fsnotify/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/hs-fsnotify/patches/patch-fsnotify.cabal
cvs diff -r1.6 -r1.7 pkgsrc/devel/hs-fsnotify/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/hs-fsnotify/Makefile 2022/02/26 12:33:45 1.6
+++ pkgsrc/devel/hs-fsnotify/Makefile 2023/01/26 15:08:26 1.7
@@ -1,27 +1,28 @@ @@ -1,27 +1,28 @@
1# $NetBSD: Makefile,v 1.6 2022/02/26 12:33:45 pho Exp $ 1# $NetBSD: Makefile,v 1.7 2023/01/26 15:08:26 pho Exp $
2 2
3DISTNAME= fsnotify-0.3.0.1 3DISTNAME= fsnotify-0.4.1.0
4PKGREVISION= 5 
5CATEGORIES= devel 4CATEGORIES= devel
6 5
7MAINTAINER= pho@cielonegro.org 6MAINTAINER= pho@cielonegro.org
8COMMENT= Cross platform library for file change notification 7COMMENT= Cross platform library for file change notification
9LICENSE= modified-bsd 8LICENSE= modified-bsd
10 9
11# On these platforms fsnotify depends on additional packages which 10# On these platforms fsnotify depends on additional packages which
12# haven't been packaged yet. 11# haven't been packaged yet.
13BROKEN_ON_PLATFORM+= Darwin-*-* 12BROKEN_ON_PLATFORM+= Darwin-*-*
14 13
15PLIST_SRC+= PLIST.common 14PLIST_SRC+= PLIST.common
16 15
17.include "../../mk/bsd.fast.prefs.mk" 16.include "../../mk/bsd.fast.prefs.mk"
18.if ${OPSYS} == "Linux" || !empty(OPSYS:M*BSD) 17.if ${OPSYS} == "Linux" || ${OPSYS:M*BSD}
19. include "../../devel/hs-hinotify/buildlink3.mk" 18. include "../../devel/hs-hinotify/buildlink3.mk"
20. include "../../devel/hs-shelly/buildlink3.mk" 19. include "../../devel/hs-shelly/buildlink3.mk"
21PLIST_SRC+= PLIST.inotify 20PLIST_SRC+= PLIST.inotify
22.endif 21.endif
23 22
24.include "../../devel/hs-async/buildlink3.mk" 23.include "../../devel/hs-async/buildlink3.mk"
 24.include "../../devel/hs-monad-control/buildlink3.mk"
 25.include "../../devel/hs-safe-exceptions/buildlink3.mk"
25.include "../../devel/hs-unix-compat/buildlink3.mk" 26.include "../../devel/hs-unix-compat/buildlink3.mk"
26.include "../../mk/haskell.mk" 27.include "../../mk/haskell.mk"
27.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/devel/hs-fsnotify/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/hs-fsnotify/buildlink3.mk 2022/02/26 12:33:45 1.6
+++ pkgsrc/devel/hs-fsnotify/buildlink3.mk 2023/01/26 15:08:26 1.7
@@ -1,22 +1,24 @@ @@ -1,22 +1,24 @@
1# $NetBSD: buildlink3.mk,v 1.6 2022/02/26 12:33:45 pho Exp $ 1# $NetBSD: buildlink3.mk,v 1.7 2023/01/26 15:08:26 pho Exp $
2 2
3BUILDLINK_TREE+= hs-fsnotify 3BUILDLINK_TREE+= hs-fsnotify
4 4
5.if !defined(HS_FSNOTIFY_BUILDLINK3_MK) 5.if !defined(HS_FSNOTIFY_BUILDLINK3_MK)
6HS_FSNOTIFY_BUILDLINK3_MK:= 6HS_FSNOTIFY_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.hs-fsnotify+= hs-fsnotify>=0.3.0 8BUILDLINK_API_DEPENDS.hs-fsnotify+= hs-fsnotify>=0.4.1
9BUILDLINK_ABI_DEPENDS.hs-fsnotify+= hs-fsnotify>=0.3.0.1nb5 9BUILDLINK_ABI_DEPENDS.hs-fsnotify+= hs-fsnotify>=0.4.1.0
10BUILDLINK_PKGSRCDIR.hs-fsnotify?= ../../devel/hs-fsnotify 10BUILDLINK_PKGSRCDIR.hs-fsnotify?= ../../devel/hs-fsnotify
11 11
12.include "../../mk/bsd.fast.prefs.mk" 12.include "../../mk/bsd.fast.prefs.mk"
13.if ${OPSYS} == "Linux" || !empty(OPSYS:M*BSD) 13.if ${OPSYS} == "Linux" || ${OPSYS:M*BSD}
14. include "../../devel/hs-hinotify/buildlink3.mk" 14. include "../../devel/hs-hinotify/buildlink3.mk"
15. include "../../devel/hs-shelly/buildlink3.mk" 15. include "../../devel/hs-shelly/buildlink3.mk"
16.endif 16.endif
17 17
18.include "../../devel/hs-async/buildlink3.mk" 18.include "../../devel/hs-async/buildlink3.mk"
 19.include "../../devel/hs-monad-control/buildlink3.mk"
 20.include "../../devel/hs-safe-exceptions/buildlink3.mk"
19.include "../../devel/hs-unix-compat/buildlink3.mk" 21.include "../../devel/hs-unix-compat/buildlink3.mk"
20.endif # HS_FSNOTIFY_BUILDLINK3_MK 22.endif # HS_FSNOTIFY_BUILDLINK3_MK
21 23
22BUILDLINK_TREE+= -hs-fsnotify 24BUILDLINK_TREE+= -hs-fsnotify
cvs diff -r1.1 -r1.2 pkgsrc/devel/hs-fsnotify/PLIST.common (expand / switch to unified diff)

--- pkgsrc/devel/hs-fsnotify/PLIST.common 2022/02/26 12:33:45 1.1
+++ pkgsrc/devel/hs-fsnotify/PLIST.common 2023/01/26 15:08:26 1.2
@@ -1,35 +1,38 @@ @@ -1,35 +1,38 @@
1@comment $NetBSD: PLIST.common,v 1.1 2022/02/26 12:33:45 pho Exp $ 1@comment $NetBSD: PLIST.common,v 1.2 2023/01/26 15:08:26 pho Exp $
2lib/fsnotify-${PKGVERSION}/${HS_VERSION}/package-description 2lib/fsnotify-${PKGVERSION}/${HS_VERSION}/package-description
3lib/fsnotify-${PKGVERSION}/${HS_VERSION}/package-id 3lib/fsnotify-${PKGVERSION}/${HS_VERSION}/package-id
4lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify.dyn_hi 4${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify.dyn_hi
5lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify.hi 5lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify.hi
6lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify.p_hi 6${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify.p_hi
7lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Devel.dyn_hi 7${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Devel.dyn_hi
8lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Devel.hi 8lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Devel.hi
9lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Devel.p_hi 9${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Devel.p_hi
10lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Listener.dyn_hi 10${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Find.dyn_hi
 11lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Find.hi
 12${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Find.p_hi
 13${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Listener.dyn_hi
11lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Listener.hi 14lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Listener.hi
12lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Listener.p_hi 15${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Listener.p_hi
13lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Path.dyn_hi 16${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Path.dyn_hi
14lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Path.hi 17lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Path.hi
15lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Path.p_hi 18${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Path.p_hi
16lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Polling.dyn_hi 19${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Polling.dyn_hi
17lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Polling.hi 20lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Polling.hi
18lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Polling.p_hi 21${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Polling.p_hi
19lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Types.dyn_hi 22${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Types.dyn_hi
20lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Types.hi 23lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Types.hi
21lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Types.p_hi 24${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Types.p_hi
22lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a 25lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
23lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a 26${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
24lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so 27${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
25share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/LICENSE 28${PLIST.doc}share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/LICENSE
26share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/System-FSNotify-Devel.html 29${PLIST.doc}share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/System-FSNotify-Devel.html
27share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/System-FSNotify.html 30${PLIST.doc}share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/System-FSNotify.html
28share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/doc-index.html 31${PLIST.doc}share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/doc-index.html
29share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/fsnotify.haddock 32${PLIST.doc}share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/fsnotify.haddock
30share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/haddock-bundle.min.js 33${PLIST.doc}share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/haddock-bundle.min.js
31share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/index.html 34${PLIST.doc}share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/index.html
32share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/linuwial.css 35${PLIST.doc}share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/linuwial.css
33share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/meta.json 36${PLIST.doc}share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/meta.json
34share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/quick-jump.css 37${PLIST.doc}share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/quick-jump.css
35share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/synopsis.png 38${PLIST.doc}share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/synopsis.png
cvs diff -r1.1 -r1.2 pkgsrc/devel/hs-fsnotify/PLIST.inotify (expand / switch to unified diff)

--- pkgsrc/devel/hs-fsnotify/PLIST.inotify 2022/02/26 12:33:45 1.1
+++ pkgsrc/devel/hs-fsnotify/PLIST.inotify 2023/01/26 15:08:26 1.2
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
1@comment $NetBSD: PLIST.inotify,v 1.1 2022/02/26 12:33:45 pho Exp $ 1@comment $NetBSD: PLIST.inotify,v 1.2 2023/01/26 15:08:26 pho Exp $
2lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Linux.dyn_hi 2${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Linux.dyn_hi
3lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Linux.hi 3lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Linux.hi
4lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Linux.p_hi 4${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify/Linux.p_hi
cvs diff -r1.4 -r1.5 pkgsrc/devel/hs-fsnotify/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/hs-fsnotify/distinfo 2022/02/26 12:33:45 1.4
+++ pkgsrc/devel/hs-fsnotify/distinfo 2023/01/26 15:08:26 1.5
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.4 2022/02/26 12:33:45 pho Exp $ 1$NetBSD: distinfo,v 1.5 2023/01/26 15:08:26 pho Exp $
2 2
3BLAKE2s (fsnotify-0.3.0.1.tar.gz) = 3a3d44c278c0deae26d2216fb2978dad5a3b0ecff915a26fad9dfe302b269827 3BLAKE2s (fsnotify-0.4.1.0.tar.gz) = d1fd7c6857bb4a980c4d9d550bba8585098523d490d0ec0acf213254e8216000
4SHA512 (fsnotify-0.3.0.1.tar.gz) = d5c96a54c1b4788e1d50f259d11d4e2d6eb7224552b50cb359a1f4cdcc2a9b7270f9b5ccdfe9738a163b54ab7ab5a0114de9cabc56660a7324cdfc4b16179e1a 4SHA512 (fsnotify-0.4.1.0.tar.gz) = bf924fb9712572e1ded14c630b1fab98daadb81cc87bbd18964176e0db3b41e1024744b996bcc205c7a57f55e63fc28db0ae4fa4009623d26316d1322ddf1c03
5Size (fsnotify-0.3.0.1.tar.gz) = 20638 bytes 5Size (fsnotify-0.4.1.0.tar.gz) = 22783 bytes
6SHA1 (patch-fsnotify.cabal) = c7e5c32063476540253c1b660316fb9ff74eae91 6SHA1 (patch-fsnotify.cabal) = d41f0e20b56a4e4a38dc944e407e219fe75f7602
cvs diff -r1.1 -r1.2 pkgsrc/devel/hs-fsnotify/patches/patch-fsnotify.cabal (expand / switch to unified diff)

--- pkgsrc/devel/hs-fsnotify/patches/patch-fsnotify.cabal 2022/02/26 12:33:45 1.1
+++ pkgsrc/devel/hs-fsnotify/patches/patch-fsnotify.cabal 2023/01/26 15:08:26 1.2
@@ -1,16 +1,28 @@ @@ -1,16 +1,28 @@
1$NetBSD: patch-fsnotify.cabal,v 1.1 2022/02/26 12:33:45 pho Exp $ 1$NetBSD: patch-fsnotify.cabal,v 1.2 2023/01/26 15:08:26 pho Exp $
2 2
3Use hinotify on some BSDs. Not upstreamed yet; can only be upstreamed after 3Use hinotify on some BSDs. libinotify emulates it with kqueue(2) which is
 4much better than polling.
 5
 6Not upstreamed yet; can only be upstreamed after
4../../devel/hs-hinotify/patches/patch-hinotify.cabal gets merged. 7../../devel/hs-hinotify/patches/patch-hinotify.cabal gets merged.
5 8
6--- fsnotify.cabal.orig 2022-02-26 11:04:55.313630845 +0000 9--- fsnotify.cabal.orig 2022-10-17 01:19:16.000000000 +0000
7+++ fsnotify.cabal 10+++ fsnotify.cabal
8@@ -38,7 +38,7 @@ Library 11@@ -46,15 +46,13 @@ library
9 , System.FSNotify.Types 12 , time >=1.1
10 Hs-Source-Dirs: src 13 , unix-compat >=0.2
11 GHC-Options: -Wall 14 default-language: Haskell2010
 15- if os(linux)
 16+ if os(linux) || os(freebsd) || os(netbsd) || os(openbsd)
 17 cpp-options: -DOS_Linux
 18 if os(windows)
 19 cpp-options: -DOS_Win32
 20 if os(darwin)
 21 cpp-options: -DOS_Mac
 22- if os(freebsd) || os(netbsd) || os(openbsd)
 23- cpp-options: -DOS_BSD
12- if os(linux) 24- if os(linux)
13+ if os(linux) || os(freebsd) || os(netbsd) || os(openbsd) 25+ if os(linux) || os(freebsd) || os(netbsd) || os(openbsd)
14 CPP-Options: -DOS_Linux 26 other-modules:
15 Other-Modules: System.FSNotify.Linux 27 System.FSNotify.Linux
16 Build-Depends: hinotify >= 0.3.0, 28 build-depends: