CVS commit: pkgsrc/www/hs-servant-server

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Thu Jan 30 16:44:30 UTC 2025

Modified Files:
        pkgsrc/www/hs-servant-server: Makefile buildlink3.mk distinfo

Log Message:
www/hs-servant-server: update to servant-server-0.20.2

0.20.2
----

- Fix build of examples/greet.hs. Add "429 Too Many Requests" error. [#1591](https://github.com/haskell-servant/servant/pull/1591)
- Full query string helpers [#1604](https://github.com/haskell-servant/servant/pull/1604)
  This involves a new instance `HasServer (QueryString :> api) context`.
- Add `MkHandler` pattern synonym [#1732](https://github.com/haskell-servant/servant/issues/1732) [#1733](https://github.com/haskell-servant/servant/pull/1733)

  Add a bidirectional pattern synonym to construct `Handler a` values from `IO
  (Either ServerError a)` ones, and match in the other direction.
- Add instance `HasServer (EmptyAPI :> api) context` [#1775](https://github.com/haskell-servant/servant/pull/1775)
- Bugfix - CaptureAll produces [""] for empty paths due to trailing slash. [#1243](https://github.com/haskell-servant/servant/issues/1243) [#1516](https://github.com/haskell-servant/servant/pull/1516)

  CaptureAll resulted in `[""]` for empty paths due to trailing slash.  Similar
  oddities occurred around these edge cases like `"/"` resulted in `[]` correctly,
  but `"//"` resulted in `["", ""]`.  This patch simply eliminates the first `""`
  in the pathinfo list as taken from the wai response.  This might break user
  code that relies on personal shims to solve the problem, however simply removing their
  workarounds should fix their code as the behavior is now sane.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/hs-servant-server/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/hs-servant-server/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/hs-servant-server/distinfo

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

Modified files:

Index: pkgsrc/www/hs-servant-server/Makefile
diff -u pkgsrc/www/hs-servant-server/Makefile:1.8 pkgsrc/www/hs-servant-server/Makefile:1.9
--- pkgsrc/www/hs-servant-server/Makefile:1.8   Thu May  9 01:32:55 2024
+++ pkgsrc/www/hs-servant-server/Makefile       Thu Jan 30 16:44:29 2025
@@ -1,37 +1,27 @@
-# $NetBSD: Makefile,v 1.8 2024/05/09 01:32:55 pho Exp $
+# $NetBSD: Makefile,v 1.9 2025/01/30 16:44:29 pho Exp $
 
-DISTNAME=      servant-server-0.20
-PKGREVISION=   2
+DISTNAME=      servant-server-0.20.2
 CATEGORIES=    www
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Family of combinators for defining webservices APIs and serving them
 LICENSE=       modified-bsd
 
+# The package unconditionally builds and installs an example executable
+# which we don't want.
 HASKELL_DISABLE_EXECUTABLES+=  \
        greet
 
-HASKELL_UNRESTRICT_DEPENDENCIES+=      \
-       base            \
-       bytestring      \
-       constraints     \
-       http-api-data   \
-       network         \
-       text
-
-.include "../../devel/hs-base-compat/buildlink3.mk"
-.include "../../converters/hs-base64-bytestring/buildlink3.mk"
 .include "../../devel/hs-constraints/buildlink3.mk"
 .include "../../www/hs-http-api-data/buildlink3.mk"
+.include "../../www/hs-servant/buildlink3.mk"
+.include "../../converters/hs-base64-bytestring/buildlink3.mk"
 .include "../../www/hs-http-media/buildlink3.mk"
 .include "../../www/hs-http-types/buildlink3.mk"
 .include "../../devel/hs-monad-control/buildlink3.mk"
 .include "../../net/hs-network/buildlink3.mk"
-.include "../../net/hs-network-uri/buildlink3.mk"
 .include "../../devel/hs-resourcet/buildlink3.mk"
-.include "../../www/hs-servant/buildlink3.mk"
 .include "../../devel/hs-sop-core/buildlink3.mk"
-.include "../../converters/hs-string-conversions/buildlink3.mk"
 .include "../../devel/hs-tagged/buildlink3.mk"
 .include "../../devel/hs-transformers-base/buildlink3.mk"
 .include "../../www/hs-wai/buildlink3.mk"

Index: pkgsrc/www/hs-servant-server/buildlink3.mk
diff -u pkgsrc/www/hs-servant-server/buildlink3.mk:1.6 pkgsrc/www/hs-servant-server/buildlink3.mk:1.7
--- pkgsrc/www/hs-servant-server/buildlink3.mk:1.6      Thu May  9 01:32:55 2024
+++ pkgsrc/www/hs-servant-server/buildlink3.mk  Thu Jan 30 16:44:29 2025
@@ -1,27 +1,24 @@
-# $NetBSD: buildlink3.mk,v 1.6 2024/05/09 01:32:55 pho Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2025/01/30 16:44:29 pho Exp $
 
 BUILDLINK_TREE+=       hs-servant-server
 
 .if !defined(HS_SERVANT_SERVER_BUILDLINK3_MK)
 HS_SERVANT_SERVER_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hs-servant-server+=      hs-servant-server>=0.20
-BUILDLINK_ABI_DEPENDS.hs-servant-server+=      hs-servant-server>=0.20nb2
+BUILDLINK_API_DEPENDS.hs-servant-server+=      hs-servant-server>=0.20.2
+BUILDLINK_ABI_DEPENDS.hs-servant-server+=      hs-servant-server>=0.20.2
 BUILDLINK_PKGSRCDIR.hs-servant-server?=                ../../www/hs-servant-server
 
-.include "../../devel/hs-base-compat/buildlink3.mk"
-.include "../../converters/hs-base64-bytestring/buildlink3.mk"
 .include "../../devel/hs-constraints/buildlink3.mk"
 .include "../../www/hs-http-api-data/buildlink3.mk"
+.include "../../www/hs-servant/buildlink3.mk"
+.include "../../converters/hs-base64-bytestring/buildlink3.mk"
 .include "../../www/hs-http-media/buildlink3.mk"
 .include "../../www/hs-http-types/buildlink3.mk"
 .include "../../devel/hs-monad-control/buildlink3.mk"
 .include "../../net/hs-network/buildlink3.mk"
-.include "../../net/hs-network-uri/buildlink3.mk"
 .include "../../devel/hs-resourcet/buildlink3.mk"
-.include "../../www/hs-servant/buildlink3.mk"
 .include "../../devel/hs-sop-core/buildlink3.mk"
-.include "../../converters/hs-string-conversions/buildlink3.mk"
 .include "../../devel/hs-tagged/buildlink3.mk"
 .include "../../devel/hs-transformers-base/buildlink3.mk"
 .include "../../www/hs-wai/buildlink3.mk"

Index: pkgsrc/www/hs-servant-server/distinfo
diff -u pkgsrc/www/hs-servant-server/distinfo:1.3 pkgsrc/www/hs-servant-server/distinfo:1.4
--- pkgsrc/www/hs-servant-server/distinfo:1.3   Sat May  4 13:33:08 2024
+++ pkgsrc/www/hs-servant-server/distinfo       Thu Jan 30 16:44:29 2025
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2024/05/04 13:33:08 pho Exp $
+$NetBSD: distinfo,v 1.4 2025/01/30 16:44:29 pho Exp $
 
-BLAKE2s (servant-server-0.20.tar.gz) = 398863406c8022357eb29038ebc48974376415e126e808471100e2c617db0b3e
-SHA512 (servant-server-0.20.tar.gz) = 4db1d8f6b08ce3af835cbc6232951a1fc6d5d8a5d63a713b33c70be1d587f1c4e6825fa3893e27056ab4635477444ebb5479add8825e3e50473833e586c0c397
-Size (servant-server-0.20.tar.gz) = 55745 bytes
+BLAKE2s (servant-server-0.20.2.tar.gz) = ce69b9aa4a028c2a95433bb6ac3e31ed54e64f8c4e16064d8c2aca4be0144be9
+SHA512 (servant-server-0.20.2.tar.gz) = 542f76bddfb036be5d612170e299940f7eeb3afeea8fc5ef2b8d7e4742afcb3fa5b66492de7721966559680c4d826d1e974c0c4b6b3db0c479b7c40064bcc087
+Size (servant-server-0.20.2.tar.gz) = 58385 bytes