aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--default.nix28
-rw-r--r--haskell-gtfs.cabal8
2 files changed, 21 insertions, 15 deletions
diff --git a/default.nix b/default.nix
index b2f0e54..4261fe5 100644
--- a/default.nix
+++ b/default.nix
@@ -1,27 +1,33 @@
-{ nixpkgs ? import <nixpkgs> {}, compiler ? "default", doBenchmark ? false }:
+{ nixpkgs ? import <nixpkgs> {}, compiler ? "ghc8107", doBenchmark ? false }:
let
inherit (nixpkgs) pkgs;
- f = { mkDerivation, aeson, base, bytestring, cassava, containers
- , data-default-class, fmt, lens, lib, regex-tdfa, servant
- , servant-docs, servant-server, servant-swagger, stm, swagger2
- , text, time, uuid, vector, wai-extra, warp, zip-archive
+ f = { mkDerivation, aeson, base, bytestring, cassava, conduit
+ , containers, data-default-class, either, extra, fmt, lens, lib
+ , monad-logger, mtl, path-pieces, persistent, persistent-postgresql
+ , regex-tdfa, resource-pool, servant, servant-docs
+ , servant-server, servant-swagger, stm, swagger2, text, time
+ , transformers, universum, unliftio-core, uuid, vector, wai-extra
+ , warp, zip-archive
}:
mkDerivation {
- pname = "haskell-gtfs";
+ pname = "tracktrain";
version = "0.1.0.0";
src = ./.;
isLibrary = true;
isExecutable = true;
libraryHaskellDepends = [
- aeson base bytestring cassava containers fmt lens regex-tdfa
- servant servant-docs servant-server servant-swagger stm swagger2
- text time uuid vector warp zip-archive
+ aeson base bytestring cassava conduit containers either extra fmt
+ lens monad-logger mtl path-pieces persistent persistent-postgresql
+ regex-tdfa resource-pool servant servant-docs servant-server
+ servant-swagger stm swagger2 text time transformers unliftio-core
+ uuid vector warp zip-archive
];
executableHaskellDepends = [
- aeson base bytestring data-default-class fmt time wai-extra warp
+ aeson base bytestring data-default-class fmt monad-logger
+ persistent-postgresql time universum wai-extra warp
];
license = "unknown";
hydraPlatforms = lib.platforms.none;
@@ -37,4 +43,4 @@ let
in
- if pkgs.lib.inNixShell then drv.env else drv
+ drv # if pkgs.lib.inNixShell then drv.env else drv
diff --git a/haskell-gtfs.cabal b/haskell-gtfs.cabal
index 7daa5d9..0396a5c 100644
--- a/haskell-gtfs.cabal
+++ b/haskell-gtfs.cabal
@@ -1,9 +1,9 @@
cabal-version: 2.4
-name: haskell-gtfs
+name: tracktrain
version: 0.1.0.0
-- A short (one-line) description of the package.
--- synopsis:
+synopsis: tracktrain tracks trains on their traintracks
-- A longer description of the package.
-- description:
@@ -21,14 +21,14 @@ maintainer: stuebinm@disroot.org
-- category:
extra-source-files: CHANGELOG.md
-executable haskell-gtfs
+executable tracktrain
main-is: Main.hs
build-depends: base ^>=4.14.3.0
, bytestring >= 0.10.10.0
, fmt >= 0.6.3.0
, time >= 1.9
, aeson
- , haskell-gtfs
+ , tracktrain
, wai-extra
, warp
, data-default-class >= 0.1.2