3
0
Fork 0
forked from mirrors/nixpkgs

haskellPackages.gogol-core: unbreak

This commit is contained in:
Ellie Hermaszewska 2021-10-21 15:23:22 +08:00
parent 524d665f4d
commit b211ea8db6
No known key found for this signature in database
GPG key ID: C8116E3A0C1CA76A
2 changed files with 31 additions and 0 deletions

View file

@ -2055,4 +2055,9 @@ EOT
# https://github.com/recursion-schemes/recursion-schemes/issues/128
recursion-schemes = appendPatch super.recursion-schemes ./patches/recursion-schemes-128.patch;
# Fix from https://github.com/brendanhay/gogol/pull/144 which has seen no release
# Can't use fetchpatch as it required tweaking the line endings as the .cabal
# file revision on hackage was gifted CRLF line endings
gogol-core = appendPatch super.gogol-core ./patches/gogol-core-144.patch;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

View file

@ -0,0 +1,26 @@
diff --git a/gogol-core.cabal b/gogol-core.cabal
index 4c47988..caa4796 100644
--- a/gogol-core.cabal
+++ b/gogol-core.cabal
@@ -62,7 +62,7 @@ library
, lens >= 4.4
, resourcet >= 1.1
, scientific >= 0.3
- , servant >= 0.4.4
+ , servant >= 0.14.1
, text >= 1.1
, unordered-containers >= 0.2.5
diff --git a/src/Network/Google/Prelude.hs b/src/Network/Google/Prelude.hs
index a4ad9de..795c690 100644
--- a/src/Network/Google/Prelude.hs
+++ b/src/Network/Google/Prelude.hs
@@ -28,7 +28,7 @@ import Network.HTTP.Client as Export (RequestBody)
import Numeric.Natural as Export (Natural)
import Prelude as Export hiding (product, span, any, Word)
import Servant.API as Export hiding (Headers, Link, getResponse, Stream, ResponseHeader, Header, header)
-import Servant.Utils.Links as Export hiding (Link)
+import Servant.Links as Export hiding (Link)
import Web.HttpApiData as Export (FromHttpApiData (..), ToHttpApiData (..))
import Network.Google.Data.Bytes as Export