Commit c62e3ef5 authored by Christopher League's avatar Christopher League
Browse files

Build with ghc-8.8.4, vanilla nix haskellPackages

Remove some dependency bounds, fix some warnings.
parent 3ac8c886
...@@ -43,7 +43,7 @@ mkDerivation { ...@@ -43,7 +43,7 @@ mkDerivation {
wai-logger warp yaml yesod yesod-core yesod-form yesod-static wai-logger warp yaml yesod yesod-core yesod-form yesod-static
yesod-test yesod-test
]; ];
preConfigure = "hpack"; prePatch = "hpack";
license = "unknown"; license = "unknown";
hydraPlatforms = stdenv.lib.platforms.none; hydraPlatforms = stdenv.lib.platforms.none;
} }
{ pkgs ? import <nixpkgs> {} }: { pkgs ? import <nixpkgs> { } }:
with pkgs; with pkgs;
with haskell.lib; with haskell.lib;
let let
ignore = [ ignore = [ "dist" "dist-newstyle" "cabal.project.local" ];
"dist"
"dist-newstyle"
"cabal.project.local"
];
keep = name: type: keep = name: type:
lib.cleanSourceFilter name type lib.cleanSourceFilter name type && !(lib.elem (baseNameOf name) ignore)
&& ! (lib.elem (baseNameOf name) ignore) && !(lib.hasPrefix ".ghc.environment" (baseNameOf name))
&& ! (lib.hasPrefix ".ghc.environment" (baseNameOf name)) && !(lib.hasPrefix "autogen-" (baseNameOf name));
&& ! (lib.hasPrefix "autogen-" (baseNameOf name)); in haskell.lib.overrideCabal (haskellPackages.callPackage ./bookme.nix { })
(drv: { src = builtins.filterSource keep ./.; })
hp = haskellPackages.override {
overrides = self: super: {
mkDerivation = args: super.mkDerivation (args // {
doHaddock = false;
enableLibraryProfiling = false;
});
};
};
in
haskell.lib.overrideCabal
(hp.callPackage ./bookme.nix { })
(drv: {
src = builtins.filterSource keep ./.;
})
...@@ -16,7 +16,7 @@ dependencies: ...@@ -16,7 +16,7 @@ dependencies:
- data-default >=0.7.1.1 && <0.8 - data-default >=0.7.1.1 && <0.8
- directory >=1.1 && <1.4 - directory >=1.1 && <1.4
- exceptions >=0.8.3 && <0.11 - exceptions >=0.8.3 && <0.11
- fast-logger >=2.2 && <2.5 - fast-logger >=2.2
- file-embed >=0.0.10.1 && <0.1 - file-embed >=0.0.10.1 && <0.1
- foreign-store >=0.2 && <0.3 - foreign-store >=0.2 && <0.3
- gogol >=0.3.0 && <0.6 - gogol >=0.3.0 && <0.6
...@@ -25,14 +25,14 @@ dependencies: ...@@ -25,14 +25,14 @@ dependencies:
- http-client-tls >=0.3 && <0.4 - http-client-tls >=0.3 && <0.4
- http-conduit >=2.3 && <2.4 - http-conduit >=2.3 && <2.4
- http-types >=0.12.1 && <0.13 - http-types >=0.12.1 && <0.13
- lens >=4.16.1 && <4.18 - lens >=4.16.1
- monad-control >=0.3 && <1.1 - monad-control >=0.3 && <1.1
- monad-logger >=0.3 && <0.4 - monad-logger >=0.3 && <0.4
- shakespeare >=2.0 && <2.1 - shakespeare >=2.0 && <2.1
- sorted-list >=0.2.0.0 && <0.3 - sorted-list >=0.2.0.0 && <0.3
- template-haskell >=2.12.0.0 && <2.15 - template-haskell >=2.12.0.0
- text >=0.11 && <2.0 - text >=0.11 && <2.0
- time >=1.8.0.2 && <1.9 - time >=1.8.0.2
- transformers >=0.5.2.0 && <0.6 - transformers >=0.5.2.0 && <0.6
- tz >=0.1.3.0 && <0.2 - tz >=0.1.3.0 && <0.2
- unordered-containers >=0.2.9.0 && <0.3 - unordered-containers >=0.2.9.0 && <0.3
......
...@@ -33,7 +33,8 @@ module Calendar ...@@ -33,7 +33,8 @@ module Calendar
where where
import ClassyPrelude.Yesod import ClassyPrelude.Yesod
import Control.Lens ((.~), (<&>), (^.)) import Control.Lens ((.~), (^.))
import Control.Monad.Fail (fail)
import Control.Monad.Logger import Control.Monad.Logger
( Loc, ( Loc,
LogSource, LogSource,
......
...@@ -30,7 +30,7 @@ import Calendar ...@@ -30,7 +30,7 @@ import Calendar
import Control.Monad.Trans.Maybe import Control.Monad.Trans.Maybe
import Data.FileEmbed (embedFile) import Data.FileEmbed (embedFile)
import qualified Data.SortedList as SL import qualified Data.SortedList as SL
import Data.Time.Clock (addUTCTime, getCurrentTime) import Data.Time.Clock (addUTCTime)
import Data.Time.Zones (localTimeToUTCTZ, utcToLocalTimeTZ) import Data.Time.Zones (localTimeToUTCTZ, utcToLocalTimeTZ)
import qualified FreshCache as FC import qualified FreshCache as FC
import Import import Import
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment