Skip to content

Commit

Permalink
Fix locale variables in Nix and .envrc (#2393)
Browse files Browse the repository at this point in the history
Co-authored-by: Paolo Capriotti <[email protected]>
  • Loading branch information
mdimjasevic and pcapriotti authored May 13, 2022
1 parent 450df4e commit c266245
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
4 changes: 4 additions & 0 deletions .envrc
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,7 @@ PATH_add "./.env/bin"

# allow local .envrc overrides
[[ -f .envrc.local ]] && source_env .envrc.local

# Locale
export LC_ALL=en_US.UTF-8
export LANG=en_US.UTF-8
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
SHELL := /usr/bin/env bash
LANG := en_US.UTF-8
DOCKER_USER ?= quay.io/wire
# kubernetes namespace for running integration tests
NAMESPACE ?= test-$(USER)
Expand Down
1 change: 1 addition & 0 deletions changelog.d/5-internal/nix-locale-archive
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix locale variables in Nix and .envrc
1 change: 1 addition & 0 deletions nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ let
# This gets sourced by direnv. Set NIX_PATH, so `nix-shell` uses the same nixpkgs as here.
text = ''
export NIX_PATH=nixpkgs=${toString pkgs.path}
export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive
'';
};

Expand Down
5 changes: 0 additions & 5 deletions tools/ormolu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,6 @@ if [ -t 1 ]; then
: ${ORMOLU_CONDENSE_OUTPUT:=1}
fi

# https://github.com/tweag/ormolu/issues/38
# https://gitlab.haskell.org/ghc/ghc/-/issues/17755
export LANG=C.UTF-8
export LC_ALL=C.UTF-8

for hsfile in $(git ls-files | grep '\.hsc\?$'); do
FAILED=0

Expand Down

0 comments on commit c266245

Please sign in to comment.