Skip to content

Commit b55269a

Browse files
committed
Set the LANG variable in .envrc
- This stops setting it in the Makefile - There is no need to set locale variables in tools/ormolu.sh any more
1 parent 062374f commit b55269a

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

.envrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,7 @@ PATH_add "./.env/bin"
2424

2525
# allow local .envrc overrides
2626
[[ -f .envrc.local ]] && source_env .envrc.local
27+
28+
# Locale
29+
export LC_ALL=en_US.UTF-8
30+
export LANG=en_US.UTF-8

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
SHELL := /usr/bin/env bash
2-
LANG := en_US.UTF-8
32
DOCKER_USER ?= quay.io/wire
43
# kubernetes namespace for running integration tests
54
NAMESPACE ?= test-$(USER)

tools/ormolu.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,6 @@ if [ -t 1 ]; then
6767
: ${ORMOLU_CONDENSE_OUTPUT:=1}
6868
fi
6969

70-
# https://github.com/tweag/ormolu/issues/38
71-
# https://gitlab.haskell.org/ghc/ghc/-/issues/17755
72-
export LANG=C.UTF-8
73-
export LC_ALL=C.UTF-8
74-
7570
for hsfile in $(git ls-files | grep '\.hsc\?$'); do
7671
FAILED=0
7772

0 commit comments

Comments
 (0)