From f11d75d94058a98946730a065150d376368f187d Mon Sep 17 00:00:00 2001 From: Athan Clark Date: Thu, 19 Nov 2015 15:46:49 -0700 Subject: [PATCH 1/2] adding nested-routes again --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 460b124d..b91be6b1 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1156,12 +1156,12 @@ packages: "Athan Clark @athanclark": # https://github.com/athanclark/nested-routes/issues/9 - #- nested-routes - commutative - composition-extra - digestive-functors-lucid - ltext - markup + - nested-routes - path-extra - poly-arity - pred-trie From 6ec249f06052bafdb12df8f522a719d09359002a Mon Sep 17 00:00:00 2001 From: Athan Clark Date: Thu, 18 Feb 2016 09:47:02 -0700 Subject: [PATCH 2/2] the nested-routes and other wai-packages for WAI >= 3.2.0 --- build-constraints.yaml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 35fee2d2..e6d587cc 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1231,10 +1231,6 @@ packages: - clash-ghc "Athan Clark @athanclark": -<<<<<<< HEAD - # https://github.com/athanclark/nested-routes/issues/9 -======= ->>>>>>> b233f7bbf4edd1aa69a4e818795b3541126cc540 - commutative - digestive-functors-lucid - ltext @@ -1244,15 +1240,15 @@ packages: - poly-arity - urlpath - wai-transformers - # Temporary block due to #1074 - # - wai-middleware-content-type - # - wai-middleware-verbs - # - nested-routes + - wai-middleware-content-type + - wai-middleware-verbs - webpage - composition-extra - rose-trees - sets + - timemap - tries + - path-extra - pred-trie "Fumiaki Kinoshita @fumieval":