diff --git a/.devcontainer/compose.yaml b/.devcontainer/compose.yaml index fb420f3..e65cdc1 100644 --- a/.devcontainer/compose.yaml +++ b/.devcontainer/compose.yaml @@ -1,13 +1,8 @@ services: devcontainer: command: sleep infinity - image: ghcr.io/tfausak/docker-haskell:9.12.2 + image: benz0li/ghc-musl:9.14-int-native init: true volumes: - ..:/workspace - - cabal-cache:/home/vscode/.cache/cabal - - cabal-store:/home/vscode/.local/state/cabal working_dir: /workspace -volumes: - cabal-cache: null - cabal-store: null diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 5266397..0502ab8 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,14 +1,6 @@ { - "customizations": { - "vscode": { - "extensions": [ - "taylorfausak.purple-yolk" - ] - } - }, - "dockerComposeFile": "compose.yaml", - "onCreateCommand": "doas apk add --no-cache git zlib-dev zlib-static", - "updateContentCommand": "cabal update", - "service": "devcontainer", - "workspaceFolder": "/workspace" + "dockerComposeFile": "compose.yaml", + "updateContentCommand": "cabal update", + "service": "devcontainer", + "workspaceFolder": "/workspace", } diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c47adb0..32346f2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,12 +31,12 @@ jobs: include: - ghc: 9.12 os: macos-14 - - ghc: 9.8 - os: ubuntu-24.04 - ghc: '9.10' os: ubuntu-24.04 - ghc: 9.12 os: ubuntu-24.04 + - ghc: 9.14 + os: ubuntu-24.04 - ghc: 9.12 os: windows-2022 build-stack: diff --git a/.gitmodules b/.gitmodules index babc95c..0bfcb88 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,6 +13,12 @@ [submodule "github-release"] path = github-release url = https://github.com/tfausak/github-release.git +[submodule "heck"] + path = heck + url = https://github.com/tfausak/heck.git +[submodule "heptapod"] + path = heptapod + url = https://github.com/tfausak/heptapod.git [submodule "imp"] path = imp url = https://github.com/tfausak/imp.git @@ -22,6 +28,9 @@ [submodule "lackey"] path = lackey url = https://github.com/tfausak/lackey.git +[submodule "literally"] + path = literally + url = https://github.com/tfausak/literally.git [submodule "patrol"] path = patrol url = https://github.com/tfausak/patrol.git diff --git a/README.md b/README.md index 618ab5f..9ec9bff 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,16 @@ I actively maintain on Hackage. [![CI](https://github.com/tfausak/github-release/actions/workflows/ci.yml/badge.svg)](https://github.com/tfausak/github-release/actions/workflows/ci.yml) [![Hackage](https://badgen.net/hackage/v/github-release)](https://hackage.haskell.org/package/github-release) +- heck + [![GitHub](https://badgen.net/github/open-issues/tfausak/heck)](https://github.com/tfausak/heck) + [![CI](https://github.com/tfausak/heck/actions/workflows/ci.yml/badge.svg)](https://github.com/tfausak/heck/actions/workflows/ci.yml) + [![Hackage](https://badgen.net/hackage/v/heck)](https://hackage.haskell.org/package/heck) + +- :squid: heptapod + [![GitHub](https://badgen.net/github/open-issues/tfausak/heptapod)](https://github.com/tfausak/heptapod) + [![CI](https://github.com/tfausak/heptapod/actions/workflows/ci.yml/badge.svg)](https://github.com/tfausak/heptapod/actions/workflows/ci.yml) + [![Hackage](https://badgen.net/hackage/v/heptapod)](https://hackage.haskell.org/package/heptapod) + - :smiling_imp: imp [![GitHub](https://badgen.net/github/open-issues/tfausak/imp)](https://github.com/tfausak/imp) [![CI](https://github.com/tfausak/imp/actions/workflows/ci.yml/badge.svg)](https://github.com/tfausak/imp/actions/workflows/ci.yml) @@ -43,6 +53,11 @@ I actively maintain on Hackage. [![CI](https://github.com/tfausak/lackey/actions/workflows/ci.yml/badge.svg)](https://github.com/tfausak/lackey/actions/workflows/ci.yml) [![Hackage](https://badgen.net/hackage/v/lackey)](https://hackage.haskell.org/package/lackey) +- literally + [![GitHub](https://badgen.net/github/open-issues/tfausak/literally)](https://github.com/tfausak/literally) + [![CI](https://github.com/tfausak/literally/actions/workflows/ci.yml/badge.svg)](https://github.com/tfausak/literally/actions/workflows/ci.yml) + [![Hackage](https://badgen.net/hackage/v/literally)](https://hackage.haskell.org/package/literally) + - :signal_strength: patrol [![GitHub](https://badgen.net/github/open-issues/tfausak/patrol)](https://github.com/tfausak/patrol) [![CI](https://github.com/tfausak/patrol/actions/workflows/ci.yml/badge.svg)](https://github.com/tfausak/patrol/actions/workflows/ci.yml) diff --git a/autoexporter b/autoexporter index a4ad6e3..9be682e 160000 --- a/autoexporter +++ b/autoexporter @@ -1 +1 @@ -Subproject commit a4ad6e398e7cab744d75f71f7f20bb38838cac46 +Subproject commit 9be682edb95f0e70c50e9d7c6f86e9b4dd484558 diff --git a/burrito b/burrito index abe4cc0..d1a9f5b 160000 --- a/burrito +++ b/burrito @@ -1 +1 @@ -Subproject commit abe4cc01a5fbd14773b876058a5d05b56e6432a2 +Subproject commit d1a9f5b23bd7ed2316e4b8e039776f915376d63d diff --git a/cabal-gild b/cabal-gild index 1f13eee..6372d59 160000 --- a/cabal-gild +++ b/cabal-gild @@ -1 +1 @@ -Subproject commit 1f13eeef0af5ff520457b5e0260f3f2e99b76fa2 +Subproject commit 6372d59b18f054e4e4d1450df158f413efd8f5fe diff --git a/cabal.project b/cabal.project index 542cd12..fdb373a 100644 --- a/cabal.project +++ b/cabal.project @@ -4,9 +4,12 @@ packages: cabal-gild flow github-release + heck + heptapod imp json-feed lackey + literally patrol rampart ratel @@ -18,9 +21,49 @@ packages: wuss allow-newer: - -- https://github.com/fizruk/http-api-data/issues/147 - -- https://github.com/haskell-servant/servant/pull/1753 - , optparse-generic:time + , aeson:base + , aeson:bytestring + , aeson:containers + , aeson:deepseq + , aeson:ghc-prim + , aeson:template-haskell + , aeson:time + , boring:base + , cborg:base + , cborg:containers + , dec:base + , directory:time + , entropy:base + , free:containers + , free:template-haskell , http-api-data:base + , http-api-data:containers + , http-media:bytestring + , http-media:containers + , indexed-traversable-instances:base + , indexed-traversable:base + , indexed-traversable:containers + , lens:containers + , lens:template-haskell + , optparse-generic:time + , semialign:base + , semialign:containers + , serialise:base + , serialise:containers + , serialise:time , servant-foreign:base , servant:base + , singleton-bool:base + , some:base + , streaming-commons:base + , tagged:base + , tagged:template-haskell + , text-iso8601:time + , these:base + , time-compat:base + , time-compat:time + , uuid-types:template-haskell + , uuid:directory + , uuid:time + , websockets:bytestring + , websockets:containers diff --git a/flow b/flow index 5042c7b..7f1c576 160000 --- a/flow +++ b/flow @@ -1 +1 @@ -Subproject commit 5042c7b539503a620d542cf21b5ddc885f086e02 +Subproject commit 7f1c576775a4ed72b141ec7f965dbd646eeebd73 diff --git a/github-release b/github-release index a497217..a54d4f2 160000 --- a/github-release +++ b/github-release @@ -1 +1 @@ -Subproject commit a497217b63b50bcc6c1a860652ee48714acf5302 +Subproject commit a54d4f2b1a44828d4acaa25689c640ab8d473ce0 diff --git a/heck b/heck new file mode 160000 index 0000000..b43ff4b --- /dev/null +++ b/heck @@ -0,0 +1 @@ +Subproject commit b43ff4bc4650786dc72cd25bc635b357dd315fe8 diff --git a/heptapod b/heptapod new file mode 160000 index 0000000..5c66af3 --- /dev/null +++ b/heptapod @@ -0,0 +1 @@ +Subproject commit 5c66af3da8bf30c8ee27a204809d56cd635e75f0 diff --git a/imp b/imp index 4a7542e..8853acb 160000 --- a/imp +++ b/imp @@ -1 +1 @@ -Subproject commit 4a7542ed6bd89f01af9ff2b8e168eaed23a442fa +Subproject commit 8853acb14b7943a82e72eb21b4f47a377aab4ccc diff --git a/json-feed b/json-feed index 094e138..2126a37 160000 --- a/json-feed +++ b/json-feed @@ -1 +1 @@ -Subproject commit 094e13850422b022e1d767226ed3e065414f3170 +Subproject commit 2126a37826aa350bf89142fca7cc1ea3f0b44501 diff --git a/lackey b/lackey index 82a57f8..25948e2 160000 --- a/lackey +++ b/lackey @@ -1 +1 @@ -Subproject commit 82a57f806dc595962a9b69737e672f3dd760474e +Subproject commit 25948e2b34697439add221244fcf8ab858059ce7 diff --git a/literally b/literally new file mode 160000 index 0000000..4c1460c --- /dev/null +++ b/literally @@ -0,0 +1 @@ +Subproject commit 4c1460c3d6a88ac1b8628f11272a1f81489a8e31 diff --git a/patrol b/patrol index 531b180..17c4594 160000 --- a/patrol +++ b/patrol @@ -1 +1 @@ -Subproject commit 531b1804c4b4b9393440fc5ff1aa322ce677e21f +Subproject commit 17c45947fe433e4c3afc569527a120bd8db513ea diff --git a/rampart b/rampart index b90b35a..74ee7e1 160000 --- a/rampart +++ b/rampart @@ -1 +1 @@ -Subproject commit b90b35a75e23f0907565c502b892a4218a4f5b4d +Subproject commit 74ee7e176ae9697fd0086be90b4f0d75e43fc556 diff --git a/ratel b/ratel index 62f0a50..c4bcb19 160000 --- a/ratel +++ b/ratel @@ -1 +1 @@ -Subproject commit 62f0a50eba38e459f8acbbac6ad31f5c5c9401ac +Subproject commit c4bcb1976ee8389b338e0fc7ec50194451379559 diff --git a/ratel-wai b/ratel-wai index 0174f85..a67d6b4 160000 --- a/ratel-wai +++ b/ratel-wai @@ -1 +1 @@ -Subproject commit 0174f85763965fa25c8610638656d28cbd5f26b0 +Subproject commit a67d6b4b861c9a86008d1d46082427f901fcd0a8 diff --git a/salve b/salve index c921a3a..c1ba8d3 160000 --- a/salve +++ b/salve @@ -1 +1 @@ -Subproject commit c921a3a95698f514f1313d6839b25fb7219bf5f0 +Subproject commit c1ba8d3c68b7ec826fc71b34e8d363c318e3ed35 diff --git a/saturn b/saturn index 9c5099b..85e0b75 160000 --- a/saturn +++ b/saturn @@ -1 +1 @@ -Subproject commit 9c5099b554eebe67a896f912bb3a3ed81de688d7 +Subproject commit 85e0b75a45d10e0d5480ae62b8eb08aea8c984ad diff --git a/stack.yaml b/stack.yaml index 40d8deb..f409deb 100644 --- a/stack.yaml +++ b/stack.yaml @@ -5,8 +5,11 @@ packages: - cabal-gild - flow - github-release + - heck + - heptapod - json-feed - lackey + - literally - patrol - rampart - ratel diff --git a/strive b/strive index b8394bc..ce21284 160000 --- a/strive +++ b/strive @@ -1 +1 @@ -Subproject commit b8394bc1dd9530145b17875fcb12a0015d1b34b4 +Subproject commit ce21284e8ae41850b5da1dbaf8f6156238d3b980 diff --git a/witch b/witch index 36a60ce..193df21 160000 --- a/witch +++ b/witch @@ -1 +1 @@ -Subproject commit 36a60cecf6bc84ed5423d9703a67c5faae50f4ab +Subproject commit 193df21b95e158d7672181d1c4fc48c0ae8b15ea diff --git a/wuss b/wuss index 154520f..cb6cf43 160000 --- a/wuss +++ b/wuss @@ -1 +1 @@ -Subproject commit 154520f723b3c64c2e2fc1413dfcdc02d6dddcee +Subproject commit cb6cf436547e3f82f5beaab5d2d9093ef25d14d1