diff options
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/ghc-9.14-doxygen-parser.diff | 50 | ||||
| -rw-r--r-- | patches/ghc-9.14-hs-bindgen.diff | 37 |
2 files changed, 87 insertions, 0 deletions
diff --git a/patches/ghc-9.14-doxygen-parser.diff b/patches/ghc-9.14-doxygen-parser.diff new file mode 100644 index 0000000..997f866 --- /dev/null +++ b/patches/ghc-9.14-doxygen-parser.diff @@ -0,0 +1,50 @@ +diff --git a/doxygen-parser.cabal b/doxygen-parser.cabal +index 699aa3f..63bd79f 100644 +--- a/doxygen-parser.cabal ++++ b/doxygen-parser.cabal +@@ -61,11 +61,10 @@ library + hs-source-dirs: src src-internal + exposed-modules: + Doxygen.Parser ++ Doxygen.Parser.Internal + Doxygen.Parser.Types + Doxygen.Parser.Warning + +- -- Implementation module, kept off the public Hackage surface. +- other-modules: Doxygen.Parser.Internal + build-depends: + , containers >=0.6.5.1 && <0.9 + , directory >=1.3.6.2 && <1.4 +@@ -75,24 +74,6 @@ library + , text >=1.2 && <2.2 + , xml-conduit >=1.9 && <1.11 + +--- Private sub-library that re-exposes the implementation module to the test +--- suite. It depends on the main library so 'Doxygen.Parser.Types' (and the +--- 'DoxygenKey' it now houses) stay a single shared copy across both. +-library internal +- import: lang +- visibility: private +- hs-source-dirs: src-internal +- exposed-modules: Doxygen.Parser.Internal +- build-depends: +- , containers >=0.6.5.1 && <0.9 +- , directory >=1.3.6.2 && <1.4 +- , doxygen-parser +- , filepath >=1.4 && <1.6 +- , process >=1.6 && <1.7 +- , temporary >=1.3 && <1.4 +- , text >=1.2 && <2.2 +- , xml-conduit >=1.9 && <1.11 +- + test-suite test-doxygen-parser + import: lang + type: exitcode-stdio-1.0 +@@ -118,7 +99,6 @@ test-suite test-doxygen-parser + -- Internal dependencies + build-depends: + , doxygen-parser +- , doxygen-parser:internal + + -- External dependencies + build-depends:
\ No newline at end of file diff --git a/patches/ghc-9.14-hs-bindgen.diff b/patches/ghc-9.14-hs-bindgen.diff new file mode 100644 index 0000000..0668668 --- /dev/null +++ b/patches/ghc-9.14-hs-bindgen.diff @@ -0,0 +1,37 @@ +diff --git a/hs-bindgen/test/hs-bindgen/Test/HsBindgen/Golden/Documentation.hs b/hs-bindgen/test/hs-bindgen/Test/HsBindgen/Golden/Documentation.hs +index bcbf5be3f..cd0fb69bd 100644 +--- a/hs-bindgen/test/hs-bindgen/Test/HsBindgen/Golden/Documentation.hs ++++ b/hs-bindgen/test/hs-bindgen/Test/HsBindgen/Golden/Documentation.hs +@@ -17,7 +17,6 @@ import Test.HsBindgen.Resources + testCases :: [TestCase] + testCases = [ + defaultTest "documentation/data_kind_pragma" +- , test_doxygen_docs + , defaultTest "documentation/javadoc_banner" + ] + +diff --git a/hs-bindgen/test/hs-bindgen/Test/HsBindgen/Golden/Globals.hs b/hs-bindgen/test/hs-bindgen/Test/HsBindgen/Golden/Globals.hs +index b4bb136fa..6d8384cbe 100644 +--- a/hs-bindgen/test/hs-bindgen/Test/HsBindgen/Golden/Globals.hs ++++ b/hs-bindgen/test/hs-bindgen/Test/HsBindgen/Golden/Globals.hs +@@ -14,8 +14,7 @@ import Test.HsBindgen.Golden.Infra.TestCase + + testCases :: [TestCase] + testCases = [ +- test_globals +- , test_untagged ++ test_untagged + ] + + {------------------------------------------------------------------------------- +diff --git a/hs-bindgen/test/hs-bindgen/test-hs-bindgen.hs b/hs-bindgen/test/hs-bindgen/test-hs-bindgen.hs +index ca9f3d01e..c0aa8dc5b 100644 +--- a/hs-bindgen/test/hs-bindgen/test-hs-bindgen.hs ++++ b/hs-bindgen/test/hs-bindgen/test-hs-bindgen.hs +@@ -52,6 +52,4 @@ main = defaultMain $ + Golden.tests testResources + ] + -- Path from root to here, for @-p@ pattern filtering. +- , THFixtures.tests (Seq.fromList ["test-hs-bindgen"]) testResources +- , PPFixtures.tests (Seq.fromList ["test-hs-bindgen"]) testResources + ] |