diff --git a/.travis.yml b/.travis.yml index c2b84fa..b833dec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,9 @@ matrix: - env: CABALVER=head GHCVER=8.6.5 compiler: ": #GHC 8.6.5" addons: {apt: {packages: [cabal-install-head,ghc-8.6.5], sources: [hvr-ghc]}} + - env: CABALVER=head GHCVER=8.8.2 + compiler: ": #GHC 8.8.2" + addons: {apt: {packages: [cabal-install-head,ghc-8.8.2], sources: [hvr-ghc]}} before_install: - unset CC diff --git a/CHANGELOG.md b/CHANGELOG.md index ed03920..7ff99d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +0.8.5.0 +----- + +Bump dependencies for ghc-8.8.2 + + 0.8.4.1 ----- diff --git a/pkgs.nix b/pkgs.nix index d4cd4be..d1de4ba 100644 --- a/pkgs.nix +++ b/pkgs.nix @@ -1,3 +1,4 @@ +{ nixpkgs ? null }: let overlay = pself: pkgs: let @@ -19,8 +20,10 @@ let # haskellPackages = pkgs.haskell.packages.ghc822.override { haskellPackages = pkgs.haskellPackages.override { overrides = self: super: { - #hspec-snap = dontCheck (self.callPackage ./pkgs/hspec-snap.nix {}); - hspec-snap = self.callCabal2nix "hspec-snap" hspec-snap-src {}; + # hspec-snap = dontCheck (self.callPackage ./pkgs/hspec-snap.nix {}); + # hspec-snap = self.callCabal2nix "hspec-snap" hspec-snap-src {}; + # hspec-snap = self.callHackage "hspec-snap" "1.0.2.0" {}; + # hspec-snap = self.callPackage ../hspec-snap {}; # hspec-snap = doJailbreak super.hspec-snap; lens = dontCheck super.lens; map-syntax = dontCheck super.map-syntax; @@ -40,4 +43,7 @@ let }; }; }; -in import ./nixpkgs.nix { overlays = [overlay]; } +in import (if isNull nixpkgs + then ./nixpkgs.nix + else nixpkgs + ) { overlays = [overlay]; } diff --git a/release.nix b/release.nix index 0a02f27..73e08cd 100644 --- a/release.nix +++ b/release.nix @@ -1,6 +1,8 @@ -{ compiler ? "default" }: +{ compiler ? "default" +, nixpkgs ? null +}: let - pkgs = import ./pkgs.nix; + pkgs = import ./pkgs.nix { inherit nixpkgs; }; haskellPackages = if compiler == "default" then pkgs.haskellPackages else pkgs.haskell.packages.${compiler}; diff --git a/servant-snap.cabal b/servant-snap.cabal index fc2232f..8786e75 100644 --- a/servant-snap.cabal +++ b/servant-snap.cabal @@ -1,5 +1,5 @@ name: servant-snap -version: 0.8.4.1 +version: 0.8.5 synopsis: A family of combinators for defining webservices APIs and serving them description: Interpret a Servant API as a Snap server, using any Snaplets you like. @@ -44,7 +44,7 @@ library Servant.Server.Internal.SnapShims Servant.Utils.StaticFiles build-depends: - base >= 4.7 && < 4.13 + base >= 4.7 && < 4.14 , aeson >= 0.7 && < 1.5 , attoparsec >= 0.12 && < 0.14 , base64-bytestring >= 1.0 && < 1.1 @@ -52,7 +52,7 @@ library , case-insensitive >= 1.2 && < 1.3 , containers >= 0.5 && < 0.7 , filepath >= 1 && < 1.5 - , http-media >= 0.7.1.2 && < 0.8 + , http-media >= 0.7.1.2 && < 0.9 , http-types >= 0.8 && < 0.13 , http-api-data >= 0.2 && < 0.5 , io-streams >= 1.3 && < 1.6 diff --git a/shell.nix b/shell.nix index e51f2f2..292eb96 100644 --- a/shell.nix +++ b/shell.nix @@ -1,5 +1,7 @@ -{ compiler ? "default" }: +{ compiler ? "default" +, nixpkgs ? null +}: let - rel = import ./release.nix { compiler = compiler; }; + rel = import ./release.nix { inherit compiler nixpkgs; }; in rel.servant-snap.env