diff --git a/Makefile b/Makefile index 5461bb55d..2c624cda6 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ BENCHARGS?=--csv bench_$(TIMESTAMP).csv $(BASELINECMD) --timeout=6 +RTS -T --non pandoc=$(shell cabal list-bin $(CABALOPTS) pandoc-cli) OPTIMIZE_WASM?=1 -all: build test binpath ## build executable and run tests +all: build test binpath flake.lock ## build executable and run tests .PHONY: all build: ## build executable @@ -55,6 +55,9 @@ test: ## unoptimized build and run tests with cabal --test-options="--hide-successes --ansi-tricks=false $(TESTARGS)" all .PHONY: test +flake.lock: flake.nix stack.yaml + nix flake update update-cabal-hashes + quick-stack: ## unoptimized build and tests with stack stack install \ --system-ghc --flag 'pandoc:embed_data_files' \ diff --git a/flake.lock b/flake.lock index 9291ff451..19d666a20 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "all-cabal-hashes": { "flake": false, "locked": { - "lastModified": 1784356889, - "narHash": "sha256-B92Npl1FUEHj75+eqZ3uGj3S/qWps/fe+bQrjgbAAow=", + "lastModified": 1784610089, + "narHash": "sha256-Oey1Zg1O176rQ8kTdmN502TIDxkfWT7GzfMCnQ7W54w=", "owner": "commercialhaskell", "repo": "all-cabal-hashes", - "rev": "cff3531b94de08924d254fc5e196e421ef6445c5", + "rev": "cf767a848c4990c780bc9850de72c21da7268e5e", "type": "github" }, "original": {