diff --git a/adapter/kafka/Setup.hs b/adapter/kafka/Setup.hs index 9a994af..4467109 100644 --- a/adapter/kafka/Setup.hs +++ b/adapter/kafka/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain diff --git a/adapter/persistent/Setup.hs b/adapter/persistent/Setup.hs index 9a994af..4467109 100644 --- a/adapter/persistent/Setup.hs +++ b/adapter/persistent/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain diff --git a/adapter/protobuf/src/Mu/Adapter/ProtoBuf.hs b/adapter/protobuf/src/Mu/Adapter/ProtoBuf.hs index 5d24393..187f4c7 100644 --- a/adapter/protobuf/src/Mu/Adapter/ProtoBuf.hs +++ b/adapter/protobuf/src/Mu/Adapter/ProtoBuf.hs @@ -44,7 +44,7 @@ import Data.Int import Data.SOP (All) import qualified Data.Text as T import qualified Data.Text.Lazy as LT -import Data.Word (Word64, Word32) +import Data.Word (Word32, Word64) import GHC.TypeLits import Proto3.Wire import qualified Proto3.Wire.Decode as PBDec diff --git a/core/rpc/Setup.hs b/core/rpc/Setup.hs index 9a994af..4467109 100644 --- a/core/rpc/Setup.hs +++ b/core/rpc/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain diff --git a/core/schema/Setup.hs b/core/schema/Setup.hs index 9a994af..4467109 100644 --- a/core/schema/Setup.hs +++ b/core/schema/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain diff --git a/default.nix b/default.nix index b8d3caf..b468f8d 100644 --- a/default.nix +++ b/default.nix @@ -6,10 +6,17 @@ in { pkgs ? import nixpkgsSrc nixpkgsArgs }: let + gitignoreSrc = pkgs.fetchFromGitHub { + owner = "hercules-ci"; + repo = "gitignore"; + rev = "c4662e6"; + sha256 = "sha256:1npnx0h6bd0d7ql93ka7azhj40zgjp815fw2r6smg8ch9p7mzdlx"; + }; + inherit (import gitignoreSrc { inherit (pkgs) lib; }) gitignoreSource; hnPkgs = pkgs.haskell-nix.stackProject { src = pkgs.haskell-nix.haskellLib.cleanGit { name = "mu-haskell"; - src = ./.; + src = gitignoreSource ./.; }; }; in { diff --git a/examples/health-check/src/ClientRecord.hs b/examples/health-check/src/ClientRecord.hs index 41d1227..1ded6d4 100644 --- a/examples/health-check/src/ClientRecord.hs +++ b/examples/health-check/src/ClientRecord.hs @@ -5,7 +5,6 @@ {-# language OverloadedStrings #-} {-# language ScopedTypeVariables #-} {-# language TypeApplications #-} -{-# language TypeOperators #-} module Main where import Data.Conduit diff --git a/examples/health-check/src/ClientTyApps.hs b/examples/health-check/src/ClientTyApps.hs index 084ee98..c0b9abd 100644 --- a/examples/health-check/src/ClientTyApps.hs +++ b/examples/health-check/src/ClientTyApps.hs @@ -4,7 +4,6 @@ {-# language OverloadedStrings #-} {-# language ScopedTypeVariables #-} {-# language TypeApplications #-} -{-# language TypeOperators #-} module Main where import Data.Conduit diff --git a/examples/seed/Setup.hs b/examples/seed/Setup.hs index 9a994af..4467109 100644 --- a/examples/seed/Setup.hs +++ b/examples/seed/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain diff --git a/examples/with-persistent/Setup.hs b/examples/with-persistent/Setup.hs index 9a994af..4467109 100644 --- a/examples/with-persistent/Setup.hs +++ b/examples/with-persistent/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain diff --git a/graphql/Setup.hs b/graphql/Setup.hs index 9a994af..4467109 100644 --- a/graphql/Setup.hs +++ b/graphql/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain diff --git a/graphql/src/Mu/GraphQL/Query/Parse.hs b/graphql/src/Mu/GraphQL/Query/Parse.hs index ac036ac..15f9a28 100644 --- a/graphql/src/Mu/GraphQL/Query/Parse.hs +++ b/graphql/src/Mu/GraphQL/Query/Parse.hs @@ -22,8 +22,8 @@ import Data.Int (Int32) import Data.List (find) import Data.Maybe import Data.Proxy -import Data.SOP.NS import Data.Scientific (Scientific, floatingOrInteger, fromFloatDigits) +import Data.SOP.NS import qualified Data.Text as T import GHC.TypeLits import qualified Language.GraphQL.AST as GQL diff --git a/grpc/client/Setup.hs b/grpc/client/Setup.hs index 9a994af..4467109 100644 --- a/grpc/client/Setup.hs +++ b/grpc/client/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain diff --git a/grpc/common/Setup.hs b/grpc/common/Setup.hs index 9a994af..4467109 100644 --- a/grpc/common/Setup.hs +++ b/grpc/common/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain diff --git a/grpc/server/Setup.hs b/grpc/server/Setup.hs index 9a994af..4467109 100644 --- a/grpc/server/Setup.hs +++ b/grpc/server/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain diff --git a/python-test.nix b/python-test.nix index 2c8dcdf..37c2bda 100644 --- a/python-test.nix +++ b/python-test.nix @@ -10,8 +10,7 @@ let ]; python2 = pkgs.python27Packages.python.withPackages python2-packages; stack = pkgs.stack; -in -{ +in { test-schema = writeShellScriptBin "test-schema.sh" '' #!/bin/sh echo "BUILDING" diff --git a/servant/server/Setup.hs b/servant/server/Setup.hs index 9a994af..4467109 100644 --- a/servant/server/Setup.hs +++ b/servant/server/Setup.hs @@ -1,2 +1,2 @@ -import Distribution.Simple +import Distribution.Simple main = defaultMain