Skip to content

Commit

Permalink
add back LC_MEASUREMENT
Browse files Browse the repository at this point in the history
  • Loading branch information
Philipp Baumann committed Sep 26, 2023
1 parent 08ba8ad commit f62b9c1
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 11 deletions.
10 changes: 6 additions & 4 deletions R/find_rev.R
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,10 @@ fetchpkgs <- function(git_pkgs, archive_pkgs){
#' ensures that Nix builds a completely coherent environment.
#' By default, the nix shell will be configured with `"en_US.UTF-8"` for the
#' relevant locale variables (`LANG`, `LC_ALL`, `LC_TIME`, `LC_MONETARY`,
#' `LC_PAPER`). This is done to ensure locale reproducibility by default
#' in Nix environments. If there are good reasons to not stick to the default,
#' you can set your preferred locale variables via
#' `LC_PAPER`, `LC_MEASUREMENT`). This is done to ensure locale
#' reproducibility by default in Nix environments created with `rix()`.
#' If there are good reasons to not stick to the default, you can set your
#' preferred locale variables via
#' `options(rix.nix_locale_variables = list(LANG = "de_CH.UTF-8", <...>)`
#' and the aforementioned locale variable names. However, you should use
#' UTF-8 locales since we import the `glibcLocalesUtf8` set only, to not
Expand Down Expand Up @@ -478,7 +479,8 @@ get_system_pkgs(system_pkgs))
LC_ALL = "en_US.UTF-8",
LC_TIME = "en_US.UTF-8",
LC_MONETARY = "en_US.UTF-8",
LC_PAPER = "en_US.UTF-8"
LC_PAPER = "en_US.UTF-8",
LC_MEASUREMENT = "en_US.UTF-8"
)
locale_variables <- getOption(
"rix.nix_locale_variables",
Expand Down
10 changes: 6 additions & 4 deletions dev/build_envs.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -369,9 +369,10 @@ you use another IDE, you can leave the "ide" argument blank:
#' ensures that Nix builds a completely coherent environment.
#' By default, the nix shell will be configured with `"en_US.UTF-8"` for the
#' relevant locale variables (`LANG`, `LC_ALL`, `LC_TIME`, `LC_MONETARY`,
#' `LC_PAPER`). This is done to ensure locale reproducibility by default
#' in Nix environments. If there are good reasons to not stick to the default,
#' you can set your preferred locale variables via
#' `LC_PAPER`, `LC_MEASUREMENT`). This is done to ensure locale
#' reproducibility by default in Nix environments created with `rix()`.
#' If there are good reasons to not stick to the default, you can set your
#' preferred locale variables via
#' `options(rix.nix_locale_variables = list(LANG = "de_CH.UTF-8", <...>)`
#' and the aforementioned locale variable names. However, you should use
#' UTF-8 locales since we import the `glibcLocalesUtf8` set only, to not
Expand Down Expand Up @@ -562,7 +563,8 @@ get_system_pkgs(system_pkgs))
LC_ALL = "en_US.UTF-8",
LC_TIME = "en_US.UTF-8",
LC_MONETARY = "en_US.UTF-8",
LC_PAPER = "en_US.UTF-8"
LC_PAPER = "en_US.UTF-8",
LC_MEASUREMENT = "en_US.UTF-8"
)
locale_variables <- getOption(
"rix.nix_locale_variables",
Expand Down
7 changes: 4 additions & 3 deletions man/rix.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit f62b9c1

Please sign in to comment.