Cleaned up stack and cabal

david-janssen · Oct 15, 2019 · 1afa96f · 1afa96f
1 parent 101a11d
commit 1afa96f
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 9 deletions.
diff --git a/kmonad.cabal b/kmonad.cabal
@@ -1,11 +1,5 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.32.0.
---
--- see: https://github.com/sol/hpack
---
--- hash: 8e1456f1261b2ebad01c59b6285b1707278d46b9b3c20e3dbda2c31750b4fe0d
-
 name:           kmonad
 version:        0.2.0
 synopsis:       Advanced keyboard remapping utility
@@ -70,7 +64,6 @@ library
       KMonad.Domain.Button.TapNext
       KMonad.Domain.Effect
       KMonad.Domain.Loop
-      --Test
   if os(linux)
     exposed-modules:
       KMonad.Api.KeyIO.Linux.DeviceSource
@@ -86,7 +79,49 @@ library
       Paths_kmonad
   hs-source-dirs:
       src
-  default-extensions: AutoDeriveTypeable BangPatterns BinaryLiterals ConstraintKinds DataKinds DefaultSignatures DeriveDataTypeable DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable DerivingStrategies DoAndIfThenElse EmptyDataDecls ExistentialQuantification FlexibleContexts FlexibleInstances FunctionalDependencies GADTs GeneralizedNewtypeDeriving InstanceSigs KindSignatures LambdaCase MonadFailDesugaring MultiParamTypeClasses MultiWayIf NamedFieldPuns OverloadedStrings PartialTypeSignatures PatternGuards PolyKinds RankNTypes RecordWildCards ScopedTypeVariables StandaloneDeriving TemplateHaskell TupleSections TypeApplications TypeOperators TypeFamilies TypeSynonymInstances ViewPatterns
+  default-extensions:
+      AutoDeriveTypeable
+      BangPatterns
+      BinaryLiterals
+      ConstraintKinds
+      DataKinds
+      DefaultSignatures
+      DeriveDataTypeable
+      DeriveFoldable
+      DeriveFunctor
+      DeriveGeneric
+      DeriveTraversable
+      DerivingStrategies
+      DoAndIfThenElse
+      EmptyDataDecls
+      ExistentialQuantification
+      FlexibleContexts
+      FlexibleInstances
+      FunctionalDependencies
+      GADTs
+      GeneralizedNewtypeDeriving
+      InstanceSigs
+      KindSignatures
+      LambdaCase
+      MonadFailDesugaring
+      MultiParamTypeClasses
+      MultiWayIf
+      NamedFieldPuns
+      OverloadedStrings
+      PartialTypeSignatures
+      PatternGuards
+      PolyKinds
+      RankNTypes
+      RecordWildCards
+      ScopedTypeVariables
+      StandaloneDeriving
+      TemplateHaskell
+      TupleSections
+      TypeApplications
+      TypeOperators
+      TypeFamilies
+      TypeSynonymInstances
+      ViewPatterns
   if os(linux)
     c-sources:
       c_src/keyio.c
@@ -98,6 +133,7 @@ library
     , bytestring
     , cereal
     , containers
+    , dhall
     , exceptions
     , hashable
     , lens
@@ -123,7 +159,10 @@ executable kmonad
       Paths_kmonad
   hs-source-dirs:
       app
-  ghc-options: -threaded -rtsopts -with-rtsopts=-N
+  ghc-options:
+      -threaded
+      -rtsopts
+      -with-rtsopts=-N
   build-depends:
       base
     , kmonad

diff --git a/stack.yaml b/stack.yaml
@@ -7,3 +7,9 @@ packages:
 #   Currently not required. Leaving this comment in case static-haskell-nix has
 #   problems in the future. If it cannot find packages, perhaps adding them here
 #   can fix this.
+
+
+# Pass a --nix flag to stack to use nix to install required packages for you (if
+# you have nix installed.)
+nix:
+  packages: [zlib]