Skip to content

Commit b05b33f

Browse files
committed
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](haskell-servant/servant#1591) - Full query string helpers [#1604](haskell-servant/servant#1604) This involves a new instance `HasServer (QueryString :> api) context`. - Add `MkHandler` pattern synonym [#1732](haskell-servant/servant#1732) [#1733](haskell-servant/servant#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](haskell-servant/servant#1775) - Bugfix - CaptureAll produces [""] for empty paths due to trailing slash. [#1243](haskell-servant/servant#1243) [#1516](haskell-servant/servant#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.
1 parent 0ec87fa commit b05b33f

3 files changed

Lines changed: 15 additions & 28 deletions

File tree

www/hs-servant-server/Makefile

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,27 @@
1-
# $NetBSD: Makefile,v 1.8 2024/05/09 01:32:55 pho Exp $
1+
# $NetBSD: Makefile,v 1.9 2025/01/30 16:44:29 pho Exp $
22

3-
DISTNAME= servant-server-0.20
4-
PKGREVISION= 2
3+
DISTNAME= servant-server-0.20.2
54
CATEGORIES= www
65

76
MAINTAINER= pkgsrc-users@NetBSD.org
87
COMMENT= Family of combinators for defining webservices APIs and serving them
98
LICENSE= modified-bsd
109

10+
# The package unconditionally builds and installs an example executable
11+
# which we don't want.
1112
HASKELL_DISABLE_EXECUTABLES+= \
1213
greet
1314

14-
HASKELL_UNRESTRICT_DEPENDENCIES+= \
15-
base \
16-
bytestring \
17-
constraints \
18-
http-api-data \
19-
network \
20-
text
21-
22-
.include "../../devel/hs-base-compat/buildlink3.mk"
23-
.include "../../converters/hs-base64-bytestring/buildlink3.mk"
2415
.include "../../devel/hs-constraints/buildlink3.mk"
2516
.include "../../www/hs-http-api-data/buildlink3.mk"
17+
.include "../../www/hs-servant/buildlink3.mk"
18+
.include "../../converters/hs-base64-bytestring/buildlink3.mk"
2619
.include "../../www/hs-http-media/buildlink3.mk"
2720
.include "../../www/hs-http-types/buildlink3.mk"
2821
.include "../../devel/hs-monad-control/buildlink3.mk"
2922
.include "../../net/hs-network/buildlink3.mk"
30-
.include "../../net/hs-network-uri/buildlink3.mk"
3123
.include "../../devel/hs-resourcet/buildlink3.mk"
32-
.include "../../www/hs-servant/buildlink3.mk"
3324
.include "../../devel/hs-sop-core/buildlink3.mk"
34-
.include "../../converters/hs-string-conversions/buildlink3.mk"
3525
.include "../../devel/hs-tagged/buildlink3.mk"
3626
.include "../../devel/hs-transformers-base/buildlink3.mk"
3727
.include "../../www/hs-wai/buildlink3.mk"

www/hs-servant-server/buildlink3.mk

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
1-
# $NetBSD: buildlink3.mk,v 1.6 2024/05/09 01:32:55 pho Exp $
1+
# $NetBSD: buildlink3.mk,v 1.7 2025/01/30 16:44:29 pho Exp $
22

33
BUILDLINK_TREE+= hs-servant-server
44

55
.if !defined(HS_SERVANT_SERVER_BUILDLINK3_MK)
66
HS_SERVANT_SERVER_BUILDLINK3_MK:=
77

8-
BUILDLINK_API_DEPENDS.hs-servant-server+= hs-servant-server>=0.20
9-
BUILDLINK_ABI_DEPENDS.hs-servant-server+= hs-servant-server>=0.20nb2
8+
BUILDLINK_API_DEPENDS.hs-servant-server+= hs-servant-server>=0.20.2
9+
BUILDLINK_ABI_DEPENDS.hs-servant-server+= hs-servant-server>=0.20.2
1010
BUILDLINK_PKGSRCDIR.hs-servant-server?= ../../www/hs-servant-server
1111

12-
.include "../../devel/hs-base-compat/buildlink3.mk"
13-
.include "../../converters/hs-base64-bytestring/buildlink3.mk"
1412
.include "../../devel/hs-constraints/buildlink3.mk"
1513
.include "../../www/hs-http-api-data/buildlink3.mk"
14+
.include "../../www/hs-servant/buildlink3.mk"
15+
.include "../../converters/hs-base64-bytestring/buildlink3.mk"
1616
.include "../../www/hs-http-media/buildlink3.mk"
1717
.include "../../www/hs-http-types/buildlink3.mk"
1818
.include "../../devel/hs-monad-control/buildlink3.mk"
1919
.include "../../net/hs-network/buildlink3.mk"
20-
.include "../../net/hs-network-uri/buildlink3.mk"
2120
.include "../../devel/hs-resourcet/buildlink3.mk"
22-
.include "../../www/hs-servant/buildlink3.mk"
2321
.include "../../devel/hs-sop-core/buildlink3.mk"
24-
.include "../../converters/hs-string-conversions/buildlink3.mk"
2522
.include "../../devel/hs-tagged/buildlink3.mk"
2623
.include "../../devel/hs-transformers-base/buildlink3.mk"
2724
.include "../../www/hs-wai/buildlink3.mk"

www/hs-servant-server/distinfo

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
$NetBSD: distinfo,v 1.3 2024/05/04 13:33:08 pho Exp $
1+
$NetBSD: distinfo,v 1.4 2025/01/30 16:44:29 pho Exp $
22

3-
BLAKE2s (servant-server-0.20.tar.gz) = 398863406c8022357eb29038ebc48974376415e126e808471100e2c617db0b3e
4-
SHA512 (servant-server-0.20.tar.gz) = 4db1d8f6b08ce3af835cbc6232951a1fc6d5d8a5d63a713b33c70be1d587f1c4e6825fa3893e27056ab4635477444ebb5479add8825e3e50473833e586c0c397
5-
Size (servant-server-0.20.tar.gz) = 55745 bytes
3+
BLAKE2s (servant-server-0.20.2.tar.gz) = ce69b9aa4a028c2a95433bb6ac3e31ed54e64f8c4e16064d8c2aca4be0144be9
4+
SHA512 (servant-server-0.20.2.tar.gz) = 542f76bddfb036be5d612170e299940f7eeb3afeea8fc5ef2b8d7e4742afcb3fa5b66492de7721966559680c4d826d1e974c0c4b6b3db0c479b7c40064bcc087
5+
Size (servant-server-0.20.2.tar.gz) = 58385 bytes

0 commit comments

Comments
 (0)