From 38bc3d17b6dc91b4fdb4d90a98d931301f35d106 Mon Sep 17 00:00:00 2001
From: romes <rodrigo.m.mesquita@gmail.com>
Date: Mon, 13 Feb 2023 10:39:40 +0000
Subject: [PATCH] Extend head.hackage
With:
* c2hs (build_tool_package)
* servant-conduit
* servant-machines
* freer-simple
* linear-generics
This adds patches for freer-simple and servant-*, but adds all 5 to the
CI extra packages
Closes https://gitlab.haskell.org/ghc/head.hackage/-/issues/69
---
ci/config.sh | 8 ++++++++
patches/freer-simple-1.2.1.2.patch | 13 +++++++++++++
patches/servant-conduit-0.15.1.patch | 13 +++++++++++++
patches/servant-machines-0.15.1.patch | 13 +++++++++++++
4 files changed, 47 insertions(+)
create mode 100644 patches/freer-simple-1.2.1.2.patch
create mode 100644 patches/servant-conduit-0.15.1.patch
create mode 100644 patches/servant-machines-0.15.1.patch
diff --git a/ci/config.sh b/ci/config.sh
index 6927f03a..96980737 100644
--- a/ci/config.sh
+++ b/ci/config.sh
@@ -77,10 +77,14 @@ echo "Found GHC $version, commit $commit."
case $version in
9.2.*)
# package ticket
+ broken linear-generics 22917
;;
9.4.*)
# package ticket
+ broken linear-generics 22546
+ broken servant-conduit 22915
+ broken servant-machines 22913
;;
9.6.*)
@@ -115,10 +119,14 @@ extra_package mmark
extra_package doctest 0.21.0
extra_package tasty
extra_package pandoc
+extra_package servant-conduit
+extra_package servant-machines
+extra_package linear-generics
# Build-tool packages
build_tool_package alex
build_tool_package happy
+build_tool_package c2hs
# $BUILD_MODE controls how head.hackage runs.
# ===========================================
diff --git a/patches/freer-simple-1.2.1.2.patch b/patches/freer-simple-1.2.1.2.patch
new file mode 100644
index 00000000..a5432f30
--- /dev/null
+++ b/patches/freer-simple-1.2.1.2.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Control/Monad/Freer/Internal.hs b/src/Control/Monad/Freer/Internal.hs
+index de96a4c..c298790 100644
+--- a/src/Control/Monad/Freer/Internal.hs
++++ b/src/Control/Monad/Freer/Internal.hs
+@@ -153,7 +153,7 @@ instance Monad (Eff effs) where
+ E u q >>= k = E u (q |> k)
+ {-# INLINE (>>=) #-}
+
+-instance (MonadBase b m, LastMember m effs) => MonadBase b (Eff effs) where
++instance (Monad b, MonadBase b m, LastMember m effs) => MonadBase b (Eff effs) where
+ liftBase = sendM . liftBase
+ {-# INLINE liftBase #-}
+
diff --git a/patches/servant-conduit-0.15.1.patch b/patches/servant-conduit-0.15.1.patch
new file mode 100644
index 00000000..540ce0fd
--- /dev/null
+++ b/patches/servant-conduit-0.15.1.patch
@@ -0,0 +1,13 @@
+diff --git a/servant-conduit.cabal b/servant-conduit.cabal
+index 83a504f..d4e5a0d 100644
+--- a/servant-conduit.cabal
++++ b/servant-conduit.cabal
+@@ -39,7 +39,7 @@ library
+ , conduit >=1.3.1 && <1.4
+ , mtl >=2.2.2 && <2.3
+ , resourcet >=1.2.2 && <1.3
+- , servant >=0.15 && <0.19
++ , servant >=0.15 && <0.20
+ , unliftio-core >=0.1.2.0 && <0.3
+ hs-source-dirs: src
+ default-language: Haskell2010
diff --git a/patches/servant-machines-0.15.1.patch b/patches/servant-machines-0.15.1.patch
new file mode 100644
index 00000000..65b6c929
--- /dev/null
+++ b/patches/servant-machines-0.15.1.patch
@@ -0,0 +1,13 @@
+diff --git a/servant-machines.cabal b/servant-machines.cabal
+index 79401a1..b7aca6e 100644
+--- a/servant-machines.cabal
++++ b/servant-machines.cabal
+@@ -38,7 +38,7 @@ library
+ , bytestring >=0.10.8.1 && <0.11
+ , machines >=0.6.4 && <0.8
+ , mtl >=2.2.2 && <2.3
+- , servant >=0.15 && <0.19
++ , servant >=0.15 && <0.20
+ hs-source-dirs: src
+ default-language: Haskell2010
+ ghc-options: -Wall
--
GitLab