Checkin cabal

.gitignore

@@ -1,8 +1,8 @@
 .stack-work/
-cql.cabal
 http/cql-http.cabal
 *~
 .DS_Store
 *.yaml#
 *.cql#
+dist-newstyle/
 

cql.cabal

@@ -0,0 +1,132 @@
+cabal-version: 1.12
+
+-- This file has been generated from package.yaml by hpack version 0.35.1.
+--
+-- see: https://github.com/sol/hpack
+
+name:           cql
+version:        0.1.0.0
+description:    Please see the README on GitHub at <https://github.com/statebox/cql#readme>
+homepage:       https://github.com/statebox/cql#readme
+bug-reports:    https://github.com/statebox/cql/issues
+author:         Statebox
+maintainer:     Statebox
+copyright:      2019 Statebox
+license:        AGPL
+build-type:     Simple
+extra-source-files:
+    README.md
+
+source-repository head
+  type: git
+  location: https://github.com/statebox/cql
+
+library
+  exposed-modules:
+      Language.CQL
+      Language.CQL.Collage
+      Language.CQL.Common
+      Language.CQL.Congruence
+      Language.CQL.Graph
+      Language.CQL.Instance
+      Language.CQL.Instance.Algebra
+      Language.CQL.Instance.Presentation
+      Language.CQL.Internal
+      Language.CQL.Mapping
+      Language.CQL.Morphism
+      Language.CQL.Options
+      Language.CQL.Parser.Instance
+      Language.CQL.Parser.LexerRules
+      Language.CQL.Parser.Mapping
+      Language.CQL.Parser.Parser
+      Language.CQL.Parser.Program
+      Language.CQL.Parser.ReservedWords
+      Language.CQL.Parser.Schema
+      Language.CQL.Parser.Transform
+      Language.CQL.Parser.Typeside
+      Language.CQL.Program
+      Language.CQL.Prover
+      Language.CQL.Query
+      Language.CQL.Schema
+      Language.CQL.Term
+      Language.CQL.Transform
+      Language.CQL.Typeside
+  other-modules:
+      Paths_cql
+  hs-source-dirs:
+      src
+  ghc-options: -Weverything -Werror -Wno-implicit-prelude -Wno-missing-export-lists -Wno-missing-import-lists -Wno-safe -Wno-missing-safe-haskell-mode -Wno-missing-local-signatures -Wno-unsafe -Wno-monomorphism-restriction -Wno-unused-type-patterns -Wno-name-shadowing -Wno-prepositive-qualified-module -Wno-unused-packages
+  build-depends:
+      PropLogic >=0.9.0.4
+    , QuickCheck
+    , base >=4.7 && <5
+    , containers
+    , deepseq
+    , fgl >=5.5
+    , megaparsec
+    , mtl >=2.0
+    , pretty
+    , scientific
+    , semigroups
+    , tabular
+    , term-rewriting
+    , twee-lib
+    , union-find ==0.2.*
+  default-language: Haskell2010
+
+executable cql
+  main-is: Main.hs
+  other-modules:
+      Paths_cql
+  hs-source-dirs:
+      cli
+  ghc-options: -Weverything -Werror -Wno-implicit-prelude -Wno-missing-export-lists -Wno-missing-import-lists -Wno-safe -Wno-missing-safe-haskell-mode -Wno-missing-local-signatures -Wno-unsafe -Wno-monomorphism-restriction -Wno-unused-type-patterns -Wno-name-shadowing -Wno-prepositive-qualified-module -Wno-unused-packages -threaded -rtsopts -with-rtsopts=-N
+  build-depends:
+      PropLogic >=0.9.0.4
+    , QuickCheck
+    , base >=4.7 && <5
+    , containers
+    , cql
+    , deepseq
+    , fgl >=5.5
+    , megaparsec
+    , mtl >=2.0
+    , pretty
+    , scientific
+    , semigroups
+    , tabular
+    , term-rewriting
+    , twee-lib
+    , union-find ==0.2.*
+  default-language: Haskell2010
+
+test-suite cql-test
+  type: exitcode-stdio-1.0
+  main-is: Spec.hs
+  other-modules:
+      CQLSpec
+      Language.CQL.Parser.Generator
+      Parser.ParserSpec
+      Paths_cql
+  hs-source-dirs:
+      test
+  ghc-options: -Weverything -Werror -Wno-implicit-prelude -Wno-missing-export-lists -Wno-missing-import-lists -Wno-safe -Wno-missing-safe-haskell-mode -Wno-missing-local-signatures -Wno-unsafe -Wno-monomorphism-restriction -Wno-unused-type-patterns -Wno-name-shadowing -Wno-prepositive-qualified-module -Wno-unused-packages -threaded -rtsopts -with-rtsopts=-N
+  build-depends:
+      PropLogic >=0.9.0.4
+    , QuickCheck
+    , base >=4.7 && <5
+    , containers
+    , cql
+    , deepseq
+    , fgl >=5.5
+    , hspec
+    , megaparsec
+    , mtl >=2.0
+    , pretty
+    , scientific
+    , semigroups
+    , tabular
+    , term-rewriting
+    , twee-lib
+    , union-find ==0.2.*
+  default-language: Haskell2010

flake.nix

@@ -0,0 +1,41 @@
+{
+  # This is a template created by `hix init`
+  inputs.haskellNix.url = "github:input-output-hk/haskell.nix";
+  inputs.nixpkgs.follows = "haskellNix/nixpkgs-unstable";
+  inputs.flake-utils.url = "github:numtide/flake-utils";
+  outputs = { self, nixpkgs, flake-utils, haskellNix }:
+    let
+      supportedSystems = [
+        "x86_64-linux"
+        "x86_64-darwin"
+        "aarch64-linux"
+        "aarch64-darwin"
+      ];
+    in
+      flake-utils.lib.eachSystem supportedSystems (system:
+      let
+        overlays = [ haskellNix.overlay
+          (final: prev: {
+            hixProject =
+              final.haskell-nix.hix.project {
+                src = ./.;
+                evalSystem = "x86_64-darwin";
+              };
+          })
+        ];
+        pkgs = import nixpkgs { inherit system overlays; inherit (haskellNix) config; };
+        flake = pkgs.hixProject.flake {};
+      in flake // {
+        legacyPackages = pkgs;
+      });
+
+  # --- Flake Local Nix Configuration ----------------------------
+  nixConfig = {
+    # This sets the flake to use the IOG nix cache.
+    # Nix should ask for permission before using it,
+    # but remove it here if you do not want it to.
+    extra-substituters = ["https://cache.iog.io"];
+    extra-trusted-public-keys = ["hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="];
+    allow-import-from-derivation = "true";
+  };
+}

http/src/Api/Config/Environment.hs

@@ -18,6 +18,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -}
+{-# LANGUAGE DerivingStrategies #-}
 module Api.Config.Environment where
 
 -- wai
@@ -29,7 +30,7 @@ import           Network.Wai.Middleware.RequestLogger (logStdout, logStdoutDev)
 data Environment
   = Development
   | Production
-  deriving (Show, Read)
+  deriving stock (Show, Read)
 
 logger :: Environment -> Middleware
 logger Development = logStdoutDev

nix/hix.nix

@@ -0,0 +1,17 @@
+{pkgs, ...}: {
+  # name = "project-name";
+  compiler-nix-name = "ghc8107"; # Version of GHC to use
+
+  # Cross compilation support:
+  # crossPlatforms = p: pkgs.lib.optionals pkgs.stdenv.hostPlatform.isx86_64 ([
+  #   p.mingwW64
+  #   p.ghcjs
+  # ] ++ pkgs.lib.optionals pkgs.stdenv.hostPlatform.isLinux [
+  #   p.musl64
+  # ]);
+
+  # Tools to include in the development shell
+  shell.tools.cabal = "latest";
+  # shell.tools.hlint = "latest";
+  # shell.tools.haskell-language-server = "latest";
+}

package.yaml

@@ -64,11 +64,14 @@ ghc-options:
 - -Wno-missing-export-lists
 - -Wno-missing-import-lists
 - -Wno-safe
+- -Wno-missing-safe-haskell-mode
 - -Wno-missing-local-signatures
 - -Wno-unsafe
 - -Wno-monomorphism-restriction
 - -Wno-unused-type-patterns
 - -Wno-name-shadowing
+- -Wno-prepositive-qualified-module
+- -Wno-unused-packages
 
 executables:
   cql: