Skip to content

Comments

Fix locale variables in Nix and .envrc#2393

Merged
mdimjasevic merged 3 commits intodevelopfrom
locale-nix
May 13, 2022
Merged

Fix locale variables in Nix and .envrc#2393
mdimjasevic merged 3 commits intodevelopfrom
locale-nix

Conversation

@mdimjasevic
Copy link
Contributor

@mdimjasevic mdimjasevic commented May 13, 2022

Some wire-server tests would fail if the locale variables were not set properly. This PR moves setting the LANG variable into .envrc (and also puts LC_ALL there). Furthermore, there is no need to set these variables any more in tools/ormolu.sh.

The C locale is Debian/Ubuntu-specific; it has been removed from the Ormolu script.

See https://sourceware.org/legacy-ml/libc-alpha/2015-02/msg00247.html.

Checklist

  • The PR Title explains the impact of the change.
  • The PR description provides context as to why the change should occur and what the code contributes to that effect. This could also be a link to a JIRA ticket or a Github issue, if there is one.
  • changelog.d contains the following bits of information (details):
    • A file with the changelog entry in one or more suitable sub-sections. The sub-sections are marked by directories inside changelog.d.

@mdimjasevic mdimjasevic temporarily deployed to cachix May 13, 2022 09:31 Inactive
Marko Dimjašević added 2 commits May 13, 2022 11:33
- This stops setting it in the Makefile
- There is no need to set locale variables in tools/ormolu.sh any more
@mdimjasevic mdimjasevic temporarily deployed to cachix May 13, 2022 09:33 Inactive
@mdimjasevic mdimjasevic marked this pull request as ready for review May 13, 2022 09:33
@mdimjasevic
Copy link
Contributor Author

@jschaul , hopefully this fixes some test failures you have been observing locally on your machine.

@mdimjasevic mdimjasevic merged commit c266245 into develop May 13, 2022
@mdimjasevic mdimjasevic deleted the locale-nix branch May 13, 2022 11:48
@mdimjasevic
Copy link
Contributor Author

@jschaul , I just tested this locally and it looks like all the problems you report in https://wearezeta.atlassian.net/browse/SQSERVICES-1552 and https://wearezeta.atlassian.net/browse/SQSERVICES-1553 seem to be addressed by this PR.

@jschaul
Copy link
Member

jschaul commented May 16, 2022

Thank you for the fix! Works for me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants