diff --git a/.gitignore b/.gitignore index 3981fb3..38634ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,13 @@ -.stack-work/ -*~ +# cabal +dist-newstyle +cabal.project.local + +# stack +.stack-work +stack.yaml.lock + +# hie +hie.yaml + +# other config.dhall diff --git a/cabal.project b/cabal.project new file mode 100644 index 0000000..3b98a43 --- /dev/null +++ b/cabal.project @@ -0,0 +1,2 @@ +packages: + ./ diff --git a/hie.yaml b/hie.yaml deleted file mode 100644 index d3d635a..0000000 --- a/hie.yaml +++ /dev/null @@ -1,6 +0,0 @@ -cradle: - stack: - - path: "./src" - component: "myriad:lib" - - path: "./app" - component: "myriad:exe:myriad-exe" \ No newline at end of file diff --git a/myriad.cabal b/myriad.cabal index 5b2f5c4..0e78cf8 100644 --- a/myriad.cabal +++ b/myriad.cabal @@ -1,10 +1,4 @@ -cabal-version: 1.12 - --- This file has been generated from package.yaml by hpack version 0.33.0. --- --- see: https://github.com/sol/hpack --- --- hash: 7ac33d24f9c1b722048859c29f93bcf4d4963bb94858761a3779b15500ad44fe +cabal-version: 2.2 name: myriad version: 0.3.0.0 @@ -26,7 +20,63 @@ source-repository head type: git location: https://github.com/1Computer1/myriad +common shared + default-language: Haskell2010 + default-extensions: + BlockArguments + ConstraintKinds + DataKinds + DeriveAnyClass + DeriveGeneric + DeriveTraversable + DerivingStrategies + FlexibleContexts + FlexibleInstances + FunctionalDependencies + GADTs + GeneralizedNewtypeDeriving + KindSignatures + LambdaCase + MultiParamTypeClasses + MultiWayIf + NamedFieldPuns + OverloadedStrings + PatternSynonyms + PolyKinds + RankNTypes + ScopedTypeVariables + TupleSections + TypeApplications + TypeFamilies + TypeOperators + ViewPatterns + build-depends: + aeson + , async + , base >= 4.13 && < 5 + , bytestring + , containers + , dhall == 1.30.* + , filepath + , lifted-async + , lifted-base + , monad-control + , monad-logger + , mtl + , servant + , servant-server + , snowflake + , string-conversions + , text + , time + , transformers + , transformers-base + , typed-process + , wai + , warp + library + import: shared exposed-modules: Myriad Myriad.Core @@ -34,68 +84,22 @@ library Myriad.Server other-modules: Paths_myriad + autogen-modules: + Paths_myriad hs-source-dirs: src - default-extensions: BlockArguments ConstraintKinds DataKinds DeriveAnyClass DeriveGeneric DeriveTraversable DerivingStrategies FlexibleContexts FlexibleInstances FunctionalDependencies GADTs GeneralizedNewtypeDeriving KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns OverloadedStrings PatternSynonyms PolyKinds RankNTypes ScopedTypeVariables TupleSections TypeApplications TypeFamilies TypeOperators ViewPatterns ghc-options: -Wall - build-depends: - aeson - , async - , base >=4.13 && <5 - , bytestring - , containers - , dhall ==1.30.* - , filepath - , lifted-async - , lifted-base - , monad-control - , monad-logger - , mtl - , servant - , servant-server - , snowflake - , string-conversions - , text - , time - , transformers - , transformers-base - , typed-process - , wai - , warp - default-language: Haskell2010 executable myriad-exe + import: shared main-is: Main.hs other-modules: Paths_myriad + autogen-modules: + Paths_myriad hs-source-dirs: app - default-extensions: BlockArguments ConstraintKinds DataKinds DeriveAnyClass DeriveGeneric DeriveTraversable DerivingStrategies FlexibleContexts FlexibleInstances FunctionalDependencies GADTs GeneralizedNewtypeDeriving KindSignatures LambdaCase MultiParamTypeClasses MultiWayIf NamedFieldPuns OverloadedStrings PatternSynonyms PolyKinds RankNTypes ScopedTypeVariables TupleSections TypeApplications TypeFamilies TypeOperators ViewPatterns ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wall build-depends: - aeson - , async - , base >=4.13 && <5 - , bytestring - , containers - , dhall ==1.30.* - , filepath - , lifted-async - , lifted-base - , monad-control - , monad-logger - , mtl - , myriad + myriad , optparse-applicative - , servant - , servant-server - , snowflake - , string-conversions - , text - , time - , transformers - , transformers-base - , typed-process - , wai - , warp - default-language: Haskell2010 diff --git a/package.yaml b/package.yaml deleted file mode 100644 index dba8a64..0000000 --- a/package.yaml +++ /dev/null @@ -1,87 +0,0 @@ -name: myriad -version: 0.3.0.0 -github: "1Computer1/myriad" -license: MIT -author: "1Computer" -maintainer: "onecomputer00@gmail.com" -copyright: "2020 1Computer" - -extra-source-files: -- README.md - -synopsis: Arbitrary code execution in Docker. -category: Server - -description: Please see the README on GitHub at - -dependencies: -- aeson -- async -- base >= 4.13 && < 5 -- bytestring -- containers -- dhall == 1.30.* -- filepath -- lifted-async -- lifted-base -- monad-control -- monad-logger -- mtl -- servant -- servant-server -- snowflake -- string-conversions -- text -- time -- transformers -- transformers-base -- typed-process -- wai -- warp - -default-extensions: -- BlockArguments -- ConstraintKinds -- DataKinds -- DeriveAnyClass -- DeriveGeneric -- DeriveTraversable -- DerivingStrategies -- FlexibleContexts -- FlexibleInstances -- FunctionalDependencies -- GADTs -- GeneralizedNewtypeDeriving -- KindSignatures -- LambdaCase -- MultiParamTypeClasses -- MultiWayIf -- NamedFieldPuns -- OverloadedStrings -- PatternSynonyms -- PolyKinds -- RankNTypes -- ScopedTypeVariables -- TupleSections -- TypeApplications -- TypeFamilies -- TypeOperators -- ViewPatterns - -library: - source-dirs: src - ghc-options: - - -Wall - -executables: - myriad-exe: - main: Main.hs - source-dirs: app - ghc-options: - - -threaded - - -rtsopts - - -with-rtsopts=-N - - -Wall - dependencies: - - myriad - - optparse-applicative diff --git a/stack.yaml b/stack.yaml index 1dce4ea..0cada57 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,66 +1,4 @@ -# This file was automatically generated by 'stack init' -# -# Some commonly used options have been documented as comments in this file. -# For advanced use and comprehensive documentation of the format, please see: -# https://docs.haskellstack.org/en/stable/yaml_configuration/ - -# Resolver to choose a 'specific' stackage snapshot or a compiler version. -# A snapshot resolver dictates the compiler version and the set of packages -# to be used for project dependencies. For example: -# -# resolver: lts-3.5 -# resolver: nightly-2015-09-21 -# resolver: ghc-7.10.2 -# -# The location of a snapshot can be provided as a file or url. Stack assumes -# a snapshot provided as a file might change, whereas a url resource does not. -# -# resolver: ./custom-snapshot.yaml -# resolver: https://example.com/snapshots/2018-01-01.yaml resolver: lts-15.15 -# User packages to be built. -# Various formats can be used as shown in the example below. -# -# packages: -# - some-directory -# - https://example.com/foo/bar/baz-0.0.2.tar.gz -# subdirs: -# - auto-update -# - wai packages: - . -# 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: -# -# extra-deps: -# - acme-missiles-0.3 -# - git: https://github.com/commercialhaskell/stack.git -# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a -# -# extra-deps: [] - -# Override default flag values for local packages and extra-deps -# flags: {} - -# Extra package databases containing global packages -# extra-package-dbs: [] - -# Control whether we use the GHC we find on the path -# system-ghc: true -# -# Require a specific version of stack, using version ranges -# require-stack-version: -any # Default -# require-stack-version: ">=2.3" -# -# Override the architecture used by stack, especially useful on Windows -# arch: i386 -# arch: x86_64 -# -# Extra directories used by stack for building -# extra-include-dirs: [/path/to/dir] -# extra-lib-dirs: [/path/to/dir] -# -# Allow a newer minor version of GHC than the snapshot specifies -# compiler-check: newer-minor diff --git a/stack.yaml.lock b/stack.yaml.lock deleted file mode 100644 index caca58d..0000000 --- a/stack.yaml.lock +++ /dev/null @@ -1,12 +0,0 @@ -# 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: 496112 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/15/15.yaml - sha256: 86169722ad0056ffc9eacc157ef80ee21d7024f92c0d2961c89ccf432db230a3 - original: lts-15.15