aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Oliver <contact@pauloliver.dev>2025-08-08 22:23:25 +0200
committerPaul Oliver <contact@pauloliver.dev>2025-08-17 01:05:09 +0000
commitb679114531a5054487123252b6e3a9d22b7c27a7 (patch)
treeceaf4ac5fc53f416f0d6f845f73b09f98ab1d722
parent8fe62292f18f4577303a868a8557b0486b218bcb (diff)
Simplifies cabal files
-rw-r--r--Makefile4
-rw-r--r--hsm-core/hsm-core.cabal5
-rw-r--r--hsm-gpio/hsm-gpio.cabal4
-rw-r--r--hsm-log/hsm-log.cabal8
-rw-r--r--hsm-pwm/hsm-pwm.cabal4
-rw-r--r--hsm-repl/hsm-repl.cabal34
-rw-r--r--stack.yaml2
-rw-r--r--stack.yaml.lock8
8 files changed, 34 insertions, 35 deletions
diff --git a/Makefile b/Makefile
index 9dbf632..8cb9a78 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-resolver = $(shell curl -s https://www.stackage.org/download/snapshots.json | yq .nightly)
+resolver = $(shell curl -s https://www.stackage.org/download/snapshots.json | yq .lts)
packages = $(shell ls -dQm hsm-*)
build:
@@ -11,4 +11,4 @@ exec:
stack exec $(exec)
update:
- yq -iSY '.resolver=$(resolver) | .packages=[$(packages)]' stack.yaml
+ yq -i '.resolver="$(resolver)" | .packages=[$(packages)]' stack.yaml
diff --git a/hsm-core/hsm-core.cabal b/hsm-core/hsm-core.cabal
index 3242ff6..10862f7 100644
--- a/hsm-core/hsm-core.cabal
+++ b/hsm-core/hsm-core.cabal
@@ -1,7 +1,5 @@
cabal-version: 3.8
-author: Paul Oliver
-build-type: Simple
-maintainer: contact@pauloliver.dev
+author: Paul Oliver <contact@pauloliver.dev>
name: hsm-core
version: 0.1.0.0
@@ -9,7 +7,6 @@ library
build-depends:
, base
, template-haskell
-
default-language: GHC2024
exposed-modules: Hsm.Core.Serial
ghc-options: -O2 -Wall -Werror -Wno-star-is-type -Wunused-packages
diff --git a/hsm-gpio/hsm-gpio.cabal b/hsm-gpio/hsm-gpio.cabal
index b38a777..a56a67a 100644
--- a/hsm-gpio/hsm-gpio.cabal
+++ b/hsm-gpio/hsm-gpio.cabal
@@ -1,7 +1,5 @@
cabal-version: 3.8
-author: Paul Oliver
-build-type: Simple
-maintainer: contact@pauloliver.dev
+author: Paul Oliver <contact@pauloliver.dev>
name: hsm-gpio
version: 0.1.0.0
diff --git a/hsm-log/hsm-log.cabal b/hsm-log/hsm-log.cabal
index 24995da..7aab0de 100644
--- a/hsm-log/hsm-log.cabal
+++ b/hsm-log/hsm-log.cabal
@@ -1,7 +1,5 @@
cabal-version: 3.8
-author: Paul Oliver
-build-type: Simple
-maintainer: contact@pauloliver.dev
+author: Paul Oliver <contact@pauloliver.dev>
name: hsm-log
version: 0.1.0.0
@@ -15,8 +13,8 @@ library
, time
, typelits-printf
- default-language: GHC2024
- exposed-modules: Hsm.Log
+ default-language: GHC2024
+ exposed-modules: Hsm.Log
ghc-options:
-O2 -Wall -Werror -Wno-star-is-type -Wunused-packages
-fplugin=Effectful.Plugin
diff --git a/hsm-pwm/hsm-pwm.cabal b/hsm-pwm/hsm-pwm.cabal
index a4453ba..2f3134a 100644
--- a/hsm-pwm/hsm-pwm.cabal
+++ b/hsm-pwm/hsm-pwm.cabal
@@ -1,7 +1,5 @@
cabal-version: 3.8
-author: Paul Oliver
-build-type: Simple
-maintainer: contact@pauloliver.dev
+author: Paul Oliver <contact@pauloliver.dev>
name: hsm-pwm
version: 0.1.0.0
diff --git a/hsm-repl/hsm-repl.cabal b/hsm-repl/hsm-repl.cabal
index fd346f9..b37e923 100644
--- a/hsm-repl/hsm-repl.cabal
+++ b/hsm-repl/hsm-repl.cabal
@@ -1,11 +1,9 @@
cabal-version: 3.8
-author: Paul Oliver
-build-type: Simple
-maintainer: contact@pauloliver.dev
+author: Paul Oliver <contact@pauloliver.dev>
name: hsm-repl
version: 0.1.0.0
-common common
+library
build-depends:
, base
, effectful-core
@@ -16,21 +14,31 @@ common common
, hsm-log
, resourcet-effectful
- default-language: GHC2024
+ default-language: GHC2024
+ exposed-modules: Hsm.Repl
ghc-options:
-O2 -Wall -Werror -Wno-star-is-type -Wunused-packages
-fplugin=Effectful.Plugin
-library
- import: common
- exposed-modules: Hsm.Repl
-
executable test-repl
- import: common
- build-depends: monad-loops
+ build-depends:
+ , base
+ , effectful-core
+ , effectful-plugin
+ , generic-data-functions
+ , haskeline
+ , hint
+ , hsm-log
+ , monad-loops
+ , resourcet-effectful
+
+ default-language: GHC2024
+ ghc-options:
+ -O2 -Wall -Werror -Wno-star-is-type -Wunused-packages
+ -fplugin=Effectful.Plugin
if !arch(x86_64)
ghc-options: -optl=-mno-fix-cortex-a53-835769
- main-is: Test/Repl.hs
- other-modules: Hsm.Repl
+ main-is: Test/Repl.hs
+ other-modules: Hsm.Repl
diff --git a/stack.yaml b/stack.yaml
index 640de3f..01991a1 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -7,4 +7,4 @@ packages:
- hsm-log
- hsm-pwm
- hsm-repl
-resolver: nightly-2025-07-02
+resolver: lts-24.3
diff --git a/stack.yaml.lock b/stack.yaml.lock
index a6533d3..a48528e 100644
--- a/stack.yaml.lock
+++ b/stack.yaml.lock
@@ -20,7 +20,7 @@ packages:
hackage: typelits-printf-0.3.0.0
snapshots:
- completed:
- sha256: 141ac77307711e7dde0c4a5ff5e0738969f77529d6a88b71fdbc317d2310142e
- size: 722188
- url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2025/7/2.yaml
- original: nightly-2025-07-02
+ sha256: aa97dce5253937e4aa56100a0a9dc1f79a554cf543ad7cfab0afe6ed42de2f31
+ size: 724941
+ url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/24/3.yaml
+ original: lts-24.3