Skip to content

Fix locale variables in Nix and .envrc #2393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mdimjasevic merged 3 commits into from
May 13, 2022
Merged

Fix locale variables in Nix and .envrc #2393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37ad68d
Set the LOCALE_ARCHIVE variable in Nix
May 13, 2022
1ad91b3
Add a changelog
May 13, 2022
e8c1ebf
Set the LANG variable in .envrc
May 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .envrc
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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