From 4bfe5baee33397bd5a5dedd43c69ccdf30287d27 Mon Sep 17 00:00:00 2001 From: Dennis Frieberg Date: Tue, 22 Sep 2020 16:53:25 +0200 Subject: [PATCH] shaped initial project --- .gitmodules | 3 +++ app/Main.hs | 3 +-- package.yaml | 5 ++--- src/Lib.hs | 6 ------ stack.yaml | 4 +++- stack.yaml.lock | 13 +++++++++++++ tickLeiste | 1 + tickLeisteTestClient.cabal | 15 ++++----------- 8 files changed, 27 insertions(+), 23 deletions(-) create mode 100644 .gitmodules delete mode 100644 src/Lib.hs create mode 100644 stack.yaml.lock create mode 160000 tickLeiste diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..9548495 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "tickLeiste"] + path = tickLeiste + url = ssh://gitolite@nerfingen.de:39999/tickLeiste diff --git a/app/Main.hs b/app/Main.hs index de1c1ab..0848f95 100644 --- a/app/Main.hs +++ b/app/Main.hs @@ -1,6 +1,5 @@ module Main where -import Lib main :: IO () -main = someFunc +main = return () diff --git a/package.yaml b/package.yaml index 5748b79..ab64935 100644 --- a/package.yaml +++ b/package.yaml @@ -21,9 +21,8 @@ description: Please see the README on GitHub at = 4.7 && < 5 - -library: - source-dirs: src +- tickLeiste +- tickLeiste-aeson executables: tickLeisteTestClient-exe: diff --git a/src/Lib.hs b/src/Lib.hs deleted file mode 100644 index d36ff27..0000000 --- a/src/Lib.hs +++ /dev/null @@ -1,6 +0,0 @@ -module Lib - ( someFunc - ) where - -someFunc :: IO () -someFunc = putStrLn "someFunc" diff --git a/stack.yaml b/stack.yaml index 9d4e22c..3342ba6 100644 --- a/stack.yaml +++ b/stack.yaml @@ -35,7 +35,9 @@ packages: # These entries can reference officially published versions as well as # forks / in-progress versions pinned to a git hash. For example: # -# extra-deps: +extra-deps: +- tickLeiste/tickLeiste +- tickLeiste/tickLeiste-aeson # - acme-missiles-0.3 # - git: https://github.com/commercialhaskell/stack.git # commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a diff --git a/stack.yaml.lock b/stack.yaml.lock new file mode 100644 index 0000000..b10e8c4 --- /dev/null +++ b/stack.yaml.lock @@ -0,0 +1,13 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: [] +snapshots: +- completed: + size: 532380 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/15.yaml + sha256: 3b5f2a699aa5ed3abbc30410062bf743926f0868ce3eeb5655370c6c6cc1a9f4 + original: + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/15.yaml diff --git a/tickLeiste b/tickLeiste new file mode 160000 index 0000000..b40c7fa --- /dev/null +++ b/tickLeiste @@ -0,0 +1 @@ +Subproject commit b40c7faef0343a09f256833d822cc7734e3fcb4f diff --git a/tickLeisteTestClient.cabal b/tickLeisteTestClient.cabal index f1f106c..8214497 100644 --- a/tickLeisteTestClient.cabal +++ b/tickLeisteTestClient.cabal @@ -23,17 +23,6 @@ source-repository head type: git location: https://github.com/githubuser/tickLeisteTestClient -library - exposed-modules: - Lib - other-modules: - Paths_tickLeisteTestClient - hs-source-dirs: - src - build-depends: - base >=4.7 && <5 - default-language: Haskell2010 - executable tickLeisteTestClient-exe main-is: Main.hs other-modules: @@ -43,6 +32,8 @@ executable tickLeisteTestClient-exe ghc-options: -threaded -rtsopts -with-rtsopts=-N build-depends: base >=4.7 && <5 + , tickLeiste + , tickLeiste-aeson , tickLeisteTestClient default-language: Haskell2010 @@ -56,5 +47,7 @@ test-suite tickLeisteTestClient-test ghc-options: -threaded -rtsopts -with-rtsopts=-N build-depends: base >=4.7 && <5 + , tickLeiste + , tickLeiste-aeson , tickLeisteTestClient default-language: Haskell2010