diff --git a/.travis.yml b/.travis.yml index 4e2b273..f445416 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,8 @@ env: - secure: "dm6I+M4+V+C7QMTpcSADdKPE633SvmToXZrTbZ7miNDGmMN+/SfHeN2ybi1+PW6oViMlbPN/7J/aEfiGjSJI8vLk72Y4uCWGmpSb8TXZLu6+whnxtZzzW8+z4tsM4048QJg7CF3N/25U8thRFgs3DqUub1Sf3nG9LrNWdz6ZcDQ=" matrix: - - GHCVERSION=ghc844 STRICT=false TRACING=false - - GHCVERSION=ghc844 STRICT=false TRACING=true + - GHCVERSION=ghc863 STRICT=false TRACING=false + - GHCVERSION=ghc863 STRICT=false TRACING=true # - GHCVERSION=ghcjs # # matrix: diff --git a/default.nix b/default.nix index f5ded4b..f06911a 100644 --- a/default.nix +++ b/default.nix @@ -1,4 +1,4 @@ -{ compiler ? "ghc844" +{ compiler ? "ghc863" , doBenchmark ? false , doTracing ? false @@ -6,8 +6,10 @@ , doProfiling ? false # enables profiling support in GHC , doStrict ? false -, rev ? "3f3f6021593070330091a4a2bc785f6761bbb3c1" -, sha256 ? "1a7vvxxz8phff51vwsrdlsq5i70ig5hxvvb7lkm2lgwizgvpa6gv" +, withHoogle ? false + +, rev ? "120eab94e0981758a1c928ff81229cd802053158" +, sha256 ? "0qk6k8gxx5xlkyg05dljywj5wx5fvrc3dzp4v2h6ab83b7zwg813" , pkgs ? if builtins.compareVersions builtins.nixVersion "2.0" < 0 @@ -31,23 +33,26 @@ drv = haskellPackages.developPackage { overrides = with pkgs.haskell.lib; self: super: { mono-traversable = dontCheck super.mono-traversable; - megaparsec = super.megaparsec_7_0_4; - }; + } // + (if withHoogle then { + ghc = super.ghc // { withPackages = super.ghc.withHoogle; }; + ghcWithPackages = self.ghc.withPackages; + } else {}); source-overrides = {}; modifier = drv: pkgs.haskell.lib.overrideCabal drv (attrs: { buildTools = (attrs.buildTools or []) ++ [ - pkgs.haskell.packages.${compiler}.cabal-install + haskellPackages.cabal-install ]; enableLibraryProfiling = doProfiling; enableExecutableProfiling = doProfiling; - testHaskellDepends = attrs.testHaskellDepends ++ - [ pkgs.nix - pkgs.haskell.packages.ghc844.criterion - ]; + testHaskellDepends = attrs.testHaskellDepends ++ [ + pkgs.nix + haskellPackages.criterion + ]; inherit doBenchmark; @@ -56,9 +61,7 @@ drv = haskellPackages.developPackage { ++ pkgs.stdenv.lib.optional doOptimize "--flags=optimize" ++ pkgs.stdenv.lib.optional doStrict "--ghc-options=-Werror"; - passthru = { - nixpkgs = pkgs; - }; + passthru = { nixpkgs = pkgs; }; }); inherit returnShellEnv;