Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions .devcontainer/compose.yaml
Original file line number Diff line number Diff line change
@@ -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
16 changes: 4 additions & 12 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -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",
}
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 9 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
15 changes: 15 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion autoexporter
2 changes: 1 addition & 1 deletion burrito
49 changes: 46 additions & 3 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ packages:
cabal-gild
flow
github-release
heck
heptapod
imp
json-feed
lackey
literally
patrol
rampart
ratel
Expand All @@ -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
2 changes: 1 addition & 1 deletion flow
2 changes: 1 addition & 1 deletion github-release
1 change: 1 addition & 0 deletions heck
Submodule heck added at b43ff4
1 change: 1 addition & 0 deletions heptapod
Submodule heptapod added at 5c66af
2 changes: 1 addition & 1 deletion imp
2 changes: 1 addition & 1 deletion json-feed
2 changes: 1 addition & 1 deletion lackey
1 change: 1 addition & 0 deletions literally
Submodule literally added at 4c1460
2 changes: 1 addition & 1 deletion rampart
2 changes: 1 addition & 1 deletion ratel
2 changes: 1 addition & 1 deletion ratel-wai
2 changes: 1 addition & 1 deletion salve
2 changes: 1 addition & 1 deletion saturn
Submodule saturn updated 55 files
+10 −12 .github/workflows/ci.yml
+1 −1 LICENSE.txt
+14 −0 cabal.project
+34 −52 saturn.cabal
+0 −31 source/libraries/spec/Saturn/Unstable/ConstantSpec.hs
+0 −23 source/libraries/spec/Saturn/Unstable/Extra/IntSpec.hs
+0 −22 source/libraries/spec/Saturn/Unstable/Extra/OrdSpec.hs
+0 −37 source/libraries/spec/Saturn/Unstable/Extra/ParsecSpec.hs
+0 −29 source/libraries/spec/Saturn/Unstable/Extra/TimeSpec.hs
+0 −20 source/libraries/spec/Saturn/Unstable/Extra/TupleSpec.hs
+0 −214 source/libraries/spec/Saturn/Unstable/ParseSpec.hs
+0 −24 source/libraries/spec/Saturn/Unstable/RenderSpec.hs
+0 −0 source/library/Saturn.hs
+0 −0 source/library/Saturn/Unstable/Constant.hs
+31 −0 source/library/Saturn/Unstable/ConstantSpec.hs
+0 −0 source/library/Saturn/Unstable/Extra/Int.hs
+23 −0 source/library/Saturn/Unstable/Extra/IntSpec.hs
+0 −0 source/library/Saturn/Unstable/Extra/Ord.hs
+22 −0 source/library/Saturn/Unstable/Extra/OrdSpec.hs
+0 −0 source/library/Saturn/Unstable/Extra/Parsec.hs
+37 −0 source/library/Saturn/Unstable/Extra/ParsecSpec.hs
+0 −0 source/library/Saturn/Unstable/Extra/Time.hs
+29 −0 source/library/Saturn/Unstable/Extra/TimeSpec.hs
+0 −0 source/library/Saturn/Unstable/Extra/Tuple.hs
+20 −0 source/library/Saturn/Unstable/Extra/TupleSpec.hs
+0 −0 source/library/Saturn/Unstable/Match.hs
+203 −184 source/library/Saturn/Unstable/MatchSpec.hs
+0 −0 source/library/Saturn/Unstable/Parse.hs
+214 −0 source/library/Saturn/Unstable/ParseSpec.hs
+0 −0 source/library/Saturn/Unstable/Render.hs
+24 −0 source/library/Saturn/Unstable/RenderSpec.hs
+0 −0 source/library/Saturn/Unstable/Type/Day.hs
+5 −3 source/library/Saturn/Unstable/Type/DaySpec.hs
+0 −0 source/library/Saturn/Unstable/Type/Element.hs
+5 −3 source/library/Saturn/Unstable/Type/ElementSpec.hs
+0 −0 source/library/Saturn/Unstable/Type/Field.hs
+5 −3 source/library/Saturn/Unstable/Type/FieldSpec.hs
+0 −0 source/library/Saturn/Unstable/Type/Hour.hs
+5 −3 source/library/Saturn/Unstable/Type/HourSpec.hs
+0 −0 source/library/Saturn/Unstable/Type/Minute.hs
+5 −3 source/library/Saturn/Unstable/Type/MinuteSpec.hs
+0 −0 source/library/Saturn/Unstable/Type/Month.hs
+5 −3 source/library/Saturn/Unstable/Type/MonthSpec.hs
+0 −0 source/library/Saturn/Unstable/Type/Number.hs
+5 −3 source/library/Saturn/Unstable/Type/NumberSpec.hs
+0 −0 source/library/Saturn/Unstable/Type/Range.hs
+5 −3 source/library/Saturn/Unstable/Type/RangeSpec.hs
+0 −0 source/library/Saturn/Unstable/Type/Schedule.hs
+5 −3 source/library/Saturn/Unstable/Type/ScheduleSpec.hs
+0 −0 source/library/Saturn/Unstable/Type/Weekday.hs
+5 −3 source/library/Saturn/Unstable/Type/WeekdaySpec.hs
+0 −0 source/library/Saturn/Unstable/Type/Wildcard.hs
+5 −3 source/library/Saturn/Unstable/Type/WildcardSpec.hs
+10 −6 source/library/SaturnSpec.hs
+31 −21 source/test-suite/Main.hs
3 changes: 3 additions & 0 deletions stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ packages:
- cabal-gild
- flow
- github-release
- heck
- heptapod
- json-feed
- lackey
- literally
- patrol
- rampart
- ratel
Expand Down
2 changes: 1 addition & 1 deletion witch
2 changes: 1 addition & 1 deletion wuss
Loading