Move the package into a dir for it

Author: Tom Sydney Kerckhove

ChangeLog.md

@@ -1,7 +1,9 @@
 let
+  pkgs = import ./nix/pkgs.nix;
   nix-pre-commit-hooks = import (builtins.fetchTarball "https://github.com/cachix/pre-commit-hooks.nix/tarball/master");
 in
 {
+  openapi3-code-generator = pkgs.haskellPackages.openapi3-code-generator;
   pre-commit-check = nix-pre-commit-hooks.run {
     src = ./.;
     hooks = {

Setup.hs

@@ -21,7 +21,7 @@ in
             (
               self: super:
                 {
-                  openapi3-code-generator = final.haskellPackages.callCabal2nix "openapi3-code-generator" (final.gitignoreSource ../.) { };
+                  openapi3-code-generator = final.haskellPackages.callCabal2nix "openapi3-code-generator" (final.gitignoreSource ../openapi3-code-generator) { };
                 }
             );
       }

coverage.overlay

@@ -1,10 +1,10 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.33.0.
+-- This file has been generated from package.yaml by hpack version 0.34.2.
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 86db47bbf34607b1b63da475684e8f3ad50f4199434c6dfdb1fd8526d0e3c01d
+-- hash: 2c9baa547ea20206f8e472e0e4f9ff734130ea57706161cab7392ab633117890
 
 name:           openapi3-code-generator
 version:        0.1.0.6
@@ -20,8 +20,6 @@ license:        MIT
 license-file:   LICENSE
 build-type:     Simple
 extra-source-files:
-    README.md
-    ChangeLog.md
     LICENSE
 
 source-repository head

default.nix

@@ -10,8 +10,6 @@ maintainer:          Joel Fisch <[email protected]> & Remo Dörig <remo.doe
 copyright:           "2020 Remo Dörig & Joel Fisch"
 
 extra-source-files:
-- README.md
-- ChangeLog.md
 - LICENSE
 
 description:         Please see the README on GitHub at <https://github.com/Haskell-OpenAPI-Code-Generator/Haskell-OpenAPI-Client-Code-Generator#readme>

nix/overlay.nix

@@ -38,8 +38,8 @@ import qualified Data.ByteString.Lazy.Char8 as LB8
 import qualified Data.HashMap.Strict as HMap
 import qualified Data.Maybe as Maybe
 import qualified Data.Scientific as Scientific
-import qualified Data.Text as T
 import Data.Text (Text)
+import qualified Data.Text as T
 import qualified Data.Time.LocalTime as Time
 import qualified Data.Vector as Vector
 import qualified Network.HTTP.Client as HC
@@ -97,11 +97,10 @@ runWithConfiguration c (StripeT r) = MR.runReaderT r c
 --
 -- > defaultConfiguration
 -- >   { configSecurityScheme = bearerAuthenticationSecurityScheme "token" }
-data Configuration
-  = Configuration
-      { configBaseURL :: Text,
-        configSecurityScheme :: SecurityScheme
-      }
+data Configuration = Configuration
+  { configBaseURL :: Text,
+    configSecurityScheme :: SecurityScheme
+  }
 
 -- | Defines how a request body is encoded
 data RequestBodyEncoding
@@ -111,13 +110,12 @@ data RequestBodyEncoding
     RequestBodyEncodingFormData
 
 -- | Defines a query parameter with the information necessary for serialization
-data QueryParameter
-  = QueryParameter
-      { queryParamName :: Text,
-        queryParamValue :: Maybe Aeson.Value,
-        queryParamStyle :: Text,
-        queryParamExplode :: Bool
-      }
+data QueryParameter = QueryParameter
+  { queryParamName :: Text,
+    queryParamValue :: Maybe Aeson.Value,
+    queryParamStyle :: Text,
+    queryParamExplode :: Bool
+  }
   deriving (Show, Eq)
 
 -- | This type specifies a security scheme which can modify a request according to the scheme (e. g. add an Authorization header)
@@ -214,12 +212,12 @@ createBaseRequest ::
   -- | The Response from the server
   HS.Request
 createBaseRequest config method path queryParams =
-  configSecurityScheme config
-    $ HS.setRequestMethod (textToByte method)
-    $ HS.setRequestQueryString query
-    $ HS.setRequestPath
-      (B8.pack (T.unpack $ byteToText basePathModifier <> path))
-      baseRequest
+  configSecurityScheme config $
+    HS.setRequestMethod (textToByte method) $
+      HS.setRequestQueryString query $
+        HS.setRequestPath
+          (B8.pack (T.unpack $ byteToText basePathModifier <> path))
+          baseRequest
   where
     baseRequest = parseURL $ configBaseURL config
     basePath = HC.path baseRequest
@@ -275,9 +273,9 @@ textToByte = B8.pack . T.unpack
 
 parseURL :: Text -> HS.Request
 parseURL url =
-  Maybe.fromMaybe HS.defaultRequest
-    $ HS.parseRequest
-    $ T.unpack url
+  Maybe.fromMaybe HS.defaultRequest $
+    HS.parseRequest $
+      T.unpack url
 
 jsonToFormData :: Aeson.Value -> [(Text, Text)]
 jsonToFormData = jsonToFormDataPrefixed ""

LICENSE renamed to openapi3-code-generator/LICENSE

@@ -297,12 +297,13 @@ createModuleHeaderWithReexports :: String -> [String] -> String -> Doc
 createModuleHeaderWithReexports moduleName modulesToExport description =
   let exports = vcat $ fmap (text . ("module " <>) . (<> ",")) modulesToExport
       imports = vcat $ fmap (text . ("import " <>)) modulesToExport
-   in generatorNote $ moduleDescription description $
-        text ("module " <> moduleName <> " (")
-          $$ nest
-            2
-            ( exports
-                $$ text ") where"
-            )
-          $$ text ""
-          $$ imports
+   in generatorNote $
+        moduleDescription description $
+          text ("module " <> moduleName <> " (")
+            $$ nest
+              2
+              ( exports
+                  $$ text ") where"
+              )
+            $$ text ""
+            $$ imports