Merge pull request #225 from snoyberg/libyaml-clib

Update CI for #224

.github/workflows/tests.yml

@@ -14,16 +14,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        resolver: [nightly, lts-20, lts-15, lts-14, lts-12, lts-11]
+        resolver: [nightly, lts-22, lts-20, lts-17]
         exclude:
           - os: windows-latest
             resolver: lts-15
           - os: windows-latest
             resolver: nightly
-        include:
-          - os: ubuntu-latest
-            resolver: lts-9
-            # problems on macOS and Windows (https://github.com/snoyberg/yaml/pull/216#issuecomment-1585522312)
 
     steps:
       - name: Clone project

libyaml/ChangeLog.md

@@ -1,5 +1,10 @@
 # Changelog for libyaml
 
+## 0.1.4
+
+* Use libyaml-clib for the cbits
+* Use pkg-config to link to system yaml
+
 ## 0.1.3
 
 * Correct signature for `fclose`

libyaml/libyaml.cabal

@@ -1,13 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.1.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
---
--- hash: a4a2ff005241200ba50deeae68beae02301af696425274c2ed0c3cb59b07d0ac
 
 name:           libyaml
-version:        0.1.3
+version:        0.1.4
 synopsis:       Low-level, streaming YAML interface.
 description:    README and API documentation are available at <https://www.stackage.org/package/libyaml>
 category:       Text
@@ -21,9 +19,6 @@ license-file:   LICENSE
 build-type:     Simple
 extra-source-files:
     include/helper.h
-    libyaml_src/yaml_private.h
-    libyaml_src/yaml.h
-    libyaml_src/LICENSE
     README.md
     ChangeLog.md
 
@@ -62,20 +57,11 @@ library
   if flag(no-unicode)
     cpp-options: -D__NO_UNICODE__
   if !(flag(system-libyaml))
-    include-dirs:
-        libyaml_src
-    c-sources:
-        libyaml_src/api.c
-        libyaml_src/dumper.c
-        libyaml_src/emitter.c
-        libyaml_src/loader.c
-        libyaml_src/parser.c
-        libyaml_src/reader.c
-        libyaml_src/scanner.c
-        libyaml_src/writer.c
+    build-depends:
+        libyaml-clib
   else
-    extra-libraries:
-        yaml
+    pkgconfig-depends:
+        yaml-0.1
   if os(windows)
     cpp-options: -DWINDOWS
     build-depends: