From 2a119b661b0a9f15d6f1bc2c801d40e0310d4802 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 30 Apr 2026 21:49:58 +0100 Subject: [PATCH] Add hpack to flake, drop Dockerfile, regen cabal --- Dockerfile | 22 ---------------------- flake.nix | 1 + hell.cabal | 4 ++-- 3 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index d7ddc61..0000000 --- a/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -# docker run -d --name hell -it -v`pwd`:`pwd` -w`pwd` ghcr.io/chrisdone/hell-build:2025-03-04 sh - -FROM alpine:20250108 - -RUN apk add stack ghc - -ADD stack.yaml /stack.yaml -ADD package.yaml /package.yaml - -RUN stack setup && stack update - -ADD src/Hell.hs /src/Hell.hs - -RUN apk add musl-dev - -RUN stack build - -RUN apk add pandoc - -RUN apk add gmp-static - -RUN apk add git diff --git a/flake.nix b/flake.nix index 2e60ed4..e0ff846 100644 --- a/flake.nix +++ b/flake.nix @@ -37,6 +37,7 @@ haskell-language-server fourmolu hlint + hpack pkgs.pandoc pkgs.zlib ]; diff --git a/hell.cabal b/hell.cabal index 0111572..54c85e3 100644 --- a/hell.cabal +++ b/hell.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.37.0. +-- This file has been generated from package.yaml by hpack version 0.38.3. -- -- see: https://github.com/sol/hpack @@ -18,7 +18,7 @@ executable hell main-is: src/Hell.hs other-modules: Paths_hell - ghc-options: -Wall -Wno-missing-pattern-synonym-signatures -O2 -threaded -rtsopts + ghc-options: -Wall -Wno-missing-pattern-synonym-signatures -O2 -threaded -rtsopts -with-rtsopts=-N build-depends: QuickCheck , aeson