From 681c65f014cd9c111cfee1639d41bc0fb1831c94 Mon Sep 17 00:00:00 2001 From: Matthew Pickering <matthewtpickering@gmail.com> Date: Mon, 30 Oct 2023 16:41:32 +0000 Subject: [PATCH] Attempt to add liquidhaskell-boot --- ci/config.cabal.project | 2 +- ci/config.sh | 1 + patches/Cabal-3.10.2.1.patch | 12 ++++++++++++ patches/Cabal-syntax-3.10.2.0.patch | 12 ++++++++++++ patches/liquid-fixpoint-0.9.2.5.patch | 13 +++++++++++++ 5 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 patches/Cabal-3.10.2.1.patch create mode 100644 patches/Cabal-syntax-3.10.2.0.patch create mode 100644 patches/liquid-fixpoint-0.9.2.5.patch diff --git a/ci/config.cabal.project b/ci/config.cabal.project index d560112f..68c9380b 100644 --- a/ci/config.cabal.project +++ b/ci/config.cabal.project @@ -3,7 +3,7 @@ -- ghc/ghc#23048. index-state: - hackage.haskell.org 2023-07-31T12:18:14Z, + hackage.haskell.org 2023-10-30T12:18:14Z, head.hackage HEAD constraints: th-abstraction >= 0.4 diff --git a/ci/config.sh b/ci/config.sh index 8fcbbe83..c590da65 100644 --- a/ci/config.sh +++ b/ci/config.sh @@ -154,6 +154,7 @@ extra_package generic-random 1.5.0.1 extra_package lame 0.2.1 extra_package inspection-testing 0.5.0.2 extra_package ghcide 2.0.0.1 +extra_package liquidhaskell-boot 0.9.2.5.0 # This package is affected by https://gitlab.haskell.org/ghc/ghc/-/issues/22912 extra_package vector-space 0.16 diff --git a/patches/Cabal-3.10.2.1.patch b/patches/Cabal-3.10.2.1.patch new file mode 100644 index 00000000..c9cdb7ac --- /dev/null +++ b/patches/Cabal-3.10.2.1.patch @@ -0,0 +1,12 @@ +diff --git a/Cabal.cabal b/Cabal.cabal +index 9bf2bf1..00988be 100644 +--- a/Cabal.cabal ++++ b/Cabal.cabal +@@ -46,6 +46,7 @@ library + process >= 1.2.1.0 && < 1.7, + time >= 1.4.0.1 && < 1.13 + ++ + if os(windows) + build-depends: Win32 >= 2.3.0.0 && < 2.14 + else diff --git a/patches/Cabal-syntax-3.10.2.0.patch b/patches/Cabal-syntax-3.10.2.0.patch new file mode 100644 index 00000000..9a64df63 --- /dev/null +++ b/patches/Cabal-syntax-3.10.2.0.patch @@ -0,0 +1,12 @@ +diff --git a/Cabal-syntax.cabal b/Cabal-syntax.cabal +index 6efbaea..e8bd0e0 100644 +--- a/Cabal-syntax.cabal ++++ b/Cabal-syntax.cabal +@@ -45,6 +45,7 @@ library + -- See also https://github.com/ekmett/transformers-compat/issues/35 + transformers (>= 0.3 && < 0.4) || (>=0.4.1.0 && <0.7) + ++ + if os(windows) + build-depends: Win32 >= 2.3.0.0 && < 2.14 + else diff --git a/patches/liquid-fixpoint-0.9.2.5.patch b/patches/liquid-fixpoint-0.9.2.5.patch new file mode 100644 index 00000000..a511baf7 --- /dev/null +++ b/patches/liquid-fixpoint-0.9.2.5.patch @@ -0,0 +1,13 @@ +diff --git a/liquid-fixpoint.cabal b/liquid-fixpoint.cabal +index 26783f4..8070349 100644 +--- a/liquid-fixpoint.cabal ++++ b/liquid-fixpoint.cabal +@@ -156,7 +156,7 @@ library + , smtlib-backends-process >= 0.3 + , stm + , store +- , vector < 0.13 ++ , vector < 0.14 + , syb + , text + , transformers -- GitLab