From fecda5bd4535fd3ac0904bfbeb8251e58929e011 Mon Sep 17 00:00:00 2001 From: Dennis Frieberg Date: Tue, 22 Sep 2020 12:17:30 +0200 Subject: [PATCH] adapted to tickLeiste restructure --- package.yaml | 1 + stack.yaml | 3 ++- tickLeiste | 2 +- tickLeisteServer.cabal | 4 +++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package.yaml b/package.yaml index a1d318d..53036a7 100644 --- a/package.yaml +++ b/package.yaml @@ -22,6 +22,7 @@ description: Please see the README on GitHub at = 4.7 && < 5 - tickLeiste +- tickLeiste-aeson - aeson - uuid - text diff --git a/stack.yaml b/stack.yaml index 89ae78d..4704f1a 100644 --- a/stack.yaml +++ b/stack.yaml @@ -31,7 +31,8 @@ resolver: # - wai packages: - . -- tickLeiste +- tickLeiste/tickLeiste +- tickLeiste/tickLeiste-aeson # Dependency packages to be pulled from upstream that are not in the resolver. # These entries can reference officially published versions as well as # forks / in-progress versions pinned to a git hash. For example: diff --git a/tickLeiste b/tickLeiste index 41055a8..b40c7fa 160000 --- a/tickLeiste +++ b/tickLeiste @@ -1 +1 @@ -Subproject commit 41055a852102dcaa8658452c09c1c0afd2f42900 +Subproject commit b40c7faef0343a09f256833d822cc7734e3fcb4f diff --git a/tickLeisteServer.cabal b/tickLeisteServer.cabal index be0ac9f..09739ac 100644 --- a/tickLeisteServer.cabal +++ b/tickLeisteServer.cabal @@ -25,7 +25,6 @@ source-repository head library exposed-modules: - Data.Aeson.TickLeiste Lib other-modules: Paths_tickLeisteServer @@ -38,6 +37,7 @@ library , containers , text , tickLeiste + , tickLeiste-aeson , uuid , websockets default-language: Haskell2010 @@ -57,6 +57,7 @@ executable tickLeisteServer , containers , text , tickLeiste + , tickLeiste-aeson , tickLeisteServer , uuid , websockets @@ -77,6 +78,7 @@ test-suite tickLeisteServer-test , containers , text , tickLeiste + , tickLeiste-aeson , tickLeisteServer , uuid , websockets