Skip to content

Commit

Permalink
Merge pull request #316 from ropensci/no-precommit
Browse files Browse the repository at this point in the history
- update top-level `default.nix` for {rix} development environment. 
- Remove `pre-commit` config because it does not play well with Nix (R-tooling/package inst based on {renv})
  • Loading branch information
philipp-baumann authored Sep 19, 2024
2 parents 34d2279 + 340f8f4 commit c8be821
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 35 deletions.
27 changes: 0 additions & 27 deletions .pre-commit-config.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion create_dev_env.R
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ rix(
r_pkgs = c(
"devtools", "diffviewer", "fledge", "lintr", "styler",
"codetools", "jsonlite", "httr", "sys", "testthat", "knitr",
"rmarkdown", "rhub", "docopt", "precommit"
"rmarkdown", "rhub"
),
system_pkgs = c("R", "glibcLocalesUtf8", "pandoc", "nix"),
tex_pkgs = "scheme-small",
Expand Down
10 changes: 3 additions & 7 deletions default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file was generated by the {rix} R package v0.11.0 on 2024-09-16
# This file was generated by the {rix} R package v0.11.0 on 2024-09-20
# with following call:
# >rix(r_ver = "bleeding_edge",
# > r_pkgs = c("devtools",
Expand All @@ -13,9 +13,7 @@
# > "testthat",
# > "knitr",
# > "rmarkdown",
# > "rhub",
# > "docopt",
# > "precommit"),
# > "rhub"),
# > system_pkgs = c("R",
# > "glibcLocalesUtf8",
# > "pandoc",
Expand All @@ -39,13 +37,11 @@ let
codetools
devtools
diffviewer
docopt
fledge
httr
jsonlite
knitr
lintr
precommit
rhub
rmarkdown
styler
Expand All @@ -70,7 +66,7 @@ let
in

pkgs.mkShell {
LOCALE_ARCHIVE = if pkgs.system == "x86_64-linux" then "${pkgs.glibcLocales}/lib/locale/locale-archive" else "";
LOCALE_ARCHIVE = if pkgs.system == "x86_64-linux" then "${pkgs.glibcLocales}/lib/locale/locale-archive" else "";
LANG = "en_US.UTF-8";
LC_ALL = "en_US.UTF-8";
LC_TIME = "en_US.UTF-8";
Expand Down

0 comments on commit c8be821

Please sign in to comment.