more PR cleanup

This commit is contained in:
Schell Scivally 2017-02-28 11:52:05 -08:00
parent f6f3d08156
commit b2e334f2e6
3 changed files with 3 additions and 9 deletions

2
deps/servant-snap vendored

@ -1 +1 @@
Subproject commit 2ba429d60b2461bf0d6641f5bf94f615d7c3bc9c
Subproject commit 6732e7eebebcb25162924ba3d25fb37647d0749a

View File

@ -4,13 +4,7 @@ let
c2n = reflex-platform.cabal2nixResult;
in reflex-platform.ghc.override {
overrides = self: super: {
#servant-snap = pkgs.haskell.lib.dontCheck (self.callPackage (c2n deps/servant-snap) {});
servant-snap = pkgs.haskell.lib.dontCheck (self.callPackage (c2n (pkgs.fetchFromGitHub {
owner = "schell";
repo = "servant-snap";
rev = "6732e7eebebcb25162924ba3d25fb37647d0749a";
sha256 = "07dh8ab1ffv5k6xik5m7zz6l3dcg6n1qbh8ndjnci0z2rim22asw";
})) {});
servant-snap = pkgs.haskell.lib.dontCheck (self.callPackage (c2n deps/servant-snap) {});
snap = pkgs.haskell.lib.dontCheck (self.callPackage (c2n deps/servant-snap/deps/snap) {});
snap-server = pkgs.haskell.lib.dontCheck (self.callPackage (c2n deps/servant-snap/deps/snap/deps/snap-server) {});
io-streams = pkgs.haskell.lib.dontCheck (self.callPackage (c2n deps/servant-snap/deps/snap/deps/io-streams) {});

View File

@ -24,7 +24,7 @@ executable back
, snap >= 1.0 && < 1.1
, snap-server >= 1.0 && < 1.1
, snap-core >= 1.0 && < 1.1
, servant >= 0.10 && < 0.11
, servant >= 0.8 && < 0.11
, servant-snap >= 0.7.2 && < 0.8
, text >= 1.2 && < 1.3
-- hs-source-dirs: