GHC 8.6.1 compatibility; bump pipes-safe

acowley · Oct 4, 2018 · 1c40ab9 · 1c40ab9
1 parent f22b62b
commit 1c40ab9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,12 +28,15 @@ before_cache:
 
 matrix:
   include:
+    - compiler: "ghc-8.6.1"
+    # env: TEST=--disable-tests BENCH=--disable-benchmarks
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}}
     - compiler: "ghc-8.4.3"
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.3], sources: [hvr-ghc]}}
     - compiler: "ghc-8.2.2"
     # env: TEST=--disable-tests BENCH=--disable-benchmarks
-      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}
+      addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
     - compiler: "ghc-head"
       env: GHCHEAD=true
       addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-head], sources: [hvr-ghc]}}

diff --git a/Frames.cabal b/Frames.cabal
@@ -1,5 +1,5 @@
 name:                Frames
-version:             0.5.0
+version:             0.5.1
 synopsis:            Data frames For working with tabular data files
 description:         User-friendly, type safe, runtime efficient tooling for
                      working with tabular data deserialized from
@@ -28,7 +28,7 @@ extra-source-files:  benchmarks/*.hs benchmarks/*.py
                      data/left1.csv data/right1.csv data/left_summary.csv
                      data/FL2.csv
 cabal-version:       >=1.10
-tested-with:         GHC == 8.2.2, GHC == 8.4.3
+tested-with:         GHC == 8.2.2, GHC == 8.4.3, GHC == 8.6.1
 
 source-repository head
   type:     git
@@ -61,7 +61,7 @@ library
                        TypeOperators, ConstraintKinds, StandaloneDeriving,
                        UndecidableInstances, ScopedTypeVariables,
                        OverloadedStrings, TypeApplications
-  build-depends:       base >=4.8 && <4.12,
+  build-depends:       base >=4.8 && <4.13,
                        ghc-prim >=0.3 && <0.6,
                        primitive >= 0.6 && < 0.7,
                        text >= 1.1.1.0,
@@ -73,7 +73,7 @@ library
                        pipes-bytestring >= 2.1.6 && < 2.2,
                        pipes-group >= 1.0.8 && < 1.1,
                        pipes-parse >= 3.0 && < 3.1,
-                       pipes-safe >= 2.2.6 && < 2.3,
+                       pipes-safe >= 2.2.6 && < 2.4,
                        bytestring,
                        vinyl >= 0.10.0 && < 0.11,
                        discrimination,

diff --git a/shell.nix b/shell.nix
@@ -12,6 +12,12 @@ packageSet = pkgs.haskell.packages.${compiler};
         overrides = (self: super: {
         ghc = super.ghc // { withPackages = f: super.ghc.withHoogle (ps: f ps ++ [ps.intero ps.cabal-install ]); };
           vinyl = super.callPackage ~/Projects/Vinyl {};
+          pipes-safe = super.callCabal2nix "pipes-safe" (pkgs.fetchFromGitHub {
+            owner = "Gabriel439";
+            repo = "Haskell-Pipes-Safe-Library";
+            rev = "de71394ea29be8558575392e4ad66f98b3d8b5e5";
+            sha256 = "0i2l36xwqskhm5kcdvmyfy2n7cf2i2qdsrap5nib825gq2mnv9z5";
+          }) {};
           # Chart = super.callHackage "Chart" "1.9" {};
           SVGFonts = super.callHackage "SVGFonts" "1.6.0.3" {};
           intero = pkgs.haskell.lib.dontCheck (super.callPackage ~/src/intero {});