diff --git a/R/find_rev.R b/R/find_rev.R index 3e784949..422e91aa 100644 --- a/R/find_rev.R +++ b/R/find_rev.R @@ -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 @@ -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", diff --git a/dev/build_envs.Rmd b/dev/build_envs.Rmd index 12300850..9f0d8923 100644 --- a/dev/build_envs.Rmd +++ b/dev/build_envs.Rmd @@ -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 @@ -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", diff --git a/man/rix.Rd b/man/rix.Rd index c6e773a3..342cc8ba 100644 --- a/man/rix.Rd +++ b/man/rix.Rd @@ -90,9 +90,10 @@ version 2.2.1 release, then use the Nix revision closest to that date, by settin ensures that Nix builds a completely coherent environment. By default, the nix shell will be configured with \code{"en_US.UTF-8"} for the relevant locale variables (\code{LANG}, \code{LC_ALL}, \code{LC_TIME}, \code{LC_MONETARY}, -\code{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 +\code{LC_PAPER}, \code{LC_MEASUREMENT}). This is done to ensure locale +reproducibility by default in Nix environments created with \code{rix()}. +If there are good reasons to not stick to the default, you can set your +preferred locale variables via \verb{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 \code{glibcLocalesUtf8} set only, to not