aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstuebinm2022-09-02 01:55:45 +0200
committerstuebinm2022-09-02 01:55:45 +0200
commitc3f30f688a14e88f9e203df5c93ae5138e080982 (patch)
tree531fb12c736e2bf4a1734be1721edf823334c025
parent8fcabd505e39b718336e57d104a84407bf6bf274 (diff)
fix the nix build
Diffstat (limited to '')
-rw-r--r--default.nix32
-rw-r--r--tracktrain.cabal4
2 files changed, 21 insertions, 15 deletions
diff --git a/default.nix b/default.nix
index c32059c..ceb8b42 100644
--- a/default.nix
+++ b/default.nix
@@ -4,14 +4,18 @@ let
inherit (nixpkgs) pkgs;
- f = { mkDerivation, aeson, base, bytestring, cassava, conduit
- , containers, data-default-class, either, extra, fmt, http-media
- , lens, lib, monad-logger, mtl, path-pieces, persistent
+ f = { mkDerivation, aeson, base, blaze-html, blaze-markup
+ , bytestring, cassava, conduit, conferer, conferer-aeson
+ , conferer-warp, conferer-yaml, containers, data-default-class
+ , directory, either, extra, fmt, http-api-data, http-media, lens
+ , lib, monad-logger, mtl, path-pieces, persistent
, persistent-postgresql, protocol-buffers
, protocol-buffers-descriptor, regex-tdfa, resource-pool, servant
- , servant-docs, servant-server, servant-swagger, stm, swagger2
- , text, time, transformers, unliftio-core, uuid, vector
- , vector-algorithms, wai-extra, warp, zip-archive
+ , servant-docs, servant-server, servant-swagger, servant-websockets
+ , shakespeare, stm, swagger2, text, time, timezone-olson
+ , timezone-series, transformers, unliftio-core, uuid, vector
+ , vector-algorithms, wai-extra, warp, websockets, yesod, yesod-form
+ , zip-archive
}:
mkDerivation {
pname = "tracktrain";
@@ -20,15 +24,19 @@ let
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base bytestring cassava conduit containers either extra fmt
+ aeson base blaze-html blaze-markup bytestring cassava conduit
+ conferer conferer-warp containers either extra fmt http-api-data
http-media lens monad-logger mtl path-pieces persistent
persistent-postgresql protocol-buffers protocol-buffers-descriptor
regex-tdfa resource-pool servant servant-docs servant-server
- servant-swagger stm swagger2 text time transformers unliftio-core
- uuid vector vector-algorithms warp zip-archive
+ servant-swagger servant-websockets shakespeare stm swagger2 text
+ time timezone-olson timezone-series transformers unliftio-core uuid
+ vector vector-algorithms warp websockets yesod yesod-form
+ zip-archive
];
executableHaskellDepends = [
- aeson base bytestring data-default-class fmt monad-logger
+ aeson base bytestring conferer conferer-aeson conferer-yaml
+ data-default-class directory extra fmt monad-logger
persistent-postgresql protocol-buffers time wai-extra warp
];
doHaddock = false;
@@ -45,6 +53,4 @@ let
drv = variant (haskellPackages.callPackage f {});
-in
-
- drv # if pkgs.lib.inNixShell then drv.env else drv
+in drv
diff --git a/tracktrain.cabal b/tracktrain.cabal
index 492c3b6..5bd7db6 100644
--- a/tracktrain.cabal
+++ b/tracktrain.cabal
@@ -26,7 +26,7 @@ executable tracktrain
build-depends: base ^>=4.14.3.0
, bytestring >= 0.10.10.0
, fmt >= 0.6.3.0
- , time >= 1.11
+ , time
, aeson
, tracktrain
, wai-extra
@@ -70,7 +70,7 @@ library
, regex-tdfa
, text
, fmt >= 0.6.3.0
- , time >= 1.11
+ , time
, aeson
, servant
, servant-server