Skip to content

Commit

Permalink
- Transfer to r-opensci: fixed links
Browse files Browse the repository at this point in the history
  • Loading branch information
Bruno Rodrigues committed Sep 12, 2024
1 parent 5a95641 commit 00e6cd0
Show file tree
Hide file tree
Showing 19 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/make_inst_default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

- name: Generate .inst/extdata/default.nix
run: |
nix-shell ./inst/extdata/default.nix --run "Rscript -e \"library(rix);rix('4.3.1', git_pkgs = list(package_name = 'rix', repo_url = 'https://github.com/b-rodrigues/rix/', commit = '${{ env.LATEST_COMMIT_HASH }}'), ide = 'other', project_path = 'inst/extdata', overwrite = TRUE)\""
nix-shell ./inst/extdata/default.nix --run "Rscript -e \"library(rix);rix('4.3.1', git_pkgs = list(package_name = 'rix', repo_url = 'https://github.com/ropensci/rix/', commit = '${{ env.LATEST_COMMIT_HASH }}'), ide = 'other', project_path = 'inst/extdata', overwrite = TRUE)\""
- name: Check if PR exists
id: check_pr
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ via [{fledge}](https://fledge.cynkra.com).
## Discussions

For general discussion about the package, open a discussion on
<https://github.com/b-rodrigues/rix/discussions>. To submit bug reports or
request features, open an issue <https://github.com/b-rodrigues/rix/issues>.
<https://github.com/ropensci/rix/discussions>. To submit bug reports or
request features, open an issue <https://github.com/ropensci/rix/issues>.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Description: Provides helper functions to create reproducible development
environments using the Nix package manager.
License: GPL (>= 3)
URL: https://b-rodrigues.github.io/rix/
BugReports: https://github.com/b-rodrigues/rix
BugReports: https://github.com/ropensci/rix
Depends:
R (>= 2.10)
Imports:
Expand Down
10 changes: 5 additions & 5 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
# rix 0.7.0 (2024-05-21)

- Added the possibility to create "bleeding_edge" and "frozen_edge" environments
- Added the possibility to use *radian* as the environment's console (courtesy of [kupac](https://github.com/b-rodrigues/rix/pull/161)) and *RStudio server*
- Added the possibility to use *radian* as the environment's console (courtesy of [kupac](https://github.com/ropensci/rix/pull/161)) and *RStudio server*
- Added `ga_cachix()`, a function to create a GA workflow file that builds and pushes an environment to a Cachix cache


Expand Down Expand Up @@ -228,7 +228,7 @@
## Bug fixes

- fix locale warnings when starting R in linux, which uses glibc (closes
[#50](https://github.com/b-rodrigues/rix/issues/50)). Now, we use
[#50](https://github.com/ropensci/rix/issues/50)). Now, we use
`glibcLocalesUtf8` from Nix for "x86_64-linux".


Expand Down Expand Up @@ -298,7 +298,7 @@

- Patch `inst/exdata/default.nix` so that `LOCALE_ARCHIVE` shellHook that was set to
glibc locale does not fail on MacOS anymore
([#40](https://github.com/b-rodrigues/rix/issues/48); fixed with [37f7ab8](https://github.com/b-rodrigues/rix/commit/37f7ab84e5423721bdf05e41816dbc99353481e7)).
([#40](https://github.com/ropensci/rix/issues/48); fixed with [37f7ab8](https://github.com/ropensci/rix/commit/37f7ab84e5423721bdf05e41816dbc99353481e7)).
- `nix_build()`: fix defensive check so the error message is referring to `project_path`
instead of `nix_file`. The patch does not change correct behavior of `nix_build()`,
hence it is only of cosmetic nature.
Expand All @@ -308,15 +308,15 @@

## Bug fixes

- `nix_build()` now correctly checks presence of `nix-build`. ([4be69b2](https://github.com/b-rodrigues/rix/commit/4be69b2c438276a1f636f3b407a124555bb12c9b))
- `nix_build()` now correctly checks presence of `nix-build`. ([4be69b2](https://github.com/ropensci/rix/commit/4be69b2c438276a1f636f3b407a124555bb12c9b))


# rix 0.1.0 (2023-08-11)

## New features

- Added `nix_build()` helper that runs `nix-build` interactively from R.
([#22](https://github.com/b-rodrigues/rix/pull/22))
([#22](https://github.com/ropensci/rix/pull/22))
- `rix()` now supports installing packages from GitHub and the CRAN archives.
- `rix()` now supports using a `nixpkgs` revision instead of an R version
for reproducibility
Expand Down
4 changes: 2 additions & 2 deletions R/rix_helpers.R
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ let
%s
# It uses nixpkgs\' revision %s for reproducibility purposes
# which will install R %s.
# Report any issues to https://github.com/b-rodrigues/rix
# Report any issues to https://github.com/ropensci/rix
let
pkgs = import (fetchTarball "%s") {};
',
Expand All @@ -57,7 +57,7 @@ let
# edge packages and R.
# Only use bleeding edge packages if absolutely needed!
# Read more on https://b-rodrigues.github.io/rix/articles/z-bleeding_edge.html
# Report any issues to https://github.com/b-rodrigues/rix
# Report any issues to https://github.com/ropensci/rix
let
pkgs = import (fetchTarball "%s") {};
',
Expand Down
6 changes: 3 additions & 3 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ output: github_document
- [Recommended reading](#recommended-reading)

<!-- badges: start -->
[![R-hub v2](https://github.com/b-rodrigues/rix/actions/workflows/rhub.yaml/badge.svg)](https://github.com/b-rodrigues/rix/actions/workflows/rhub.yaml/badge.svg)
[![R-hub v2](https://github.com/ropensci/rix/actions/workflows/rhub.yaml/badge.svg)](https://github.com/ropensci/rix/actions/workflows/rhub.yaml/badge.svg)
[![runiverse-package rix](https://b-rodrigues.r-universe.dev/badges/rix?scale=1&color=pink&style=round)](https://b-rodrigues.r-universe.dev/rix)
[![Docs](https://img.shields.io/badge/docs-release-blue.svg)](https://b-rodrigues.github.io/rix)
[![Status at rOpenSci Software Peer Review](https://badges.ropensci.org/625_status.svg)](https://github.com/ropensci/software-review/issues/625)
Expand Down Expand Up @@ -212,7 +212,7 @@ can run a temporary R session with R using this command (it will build the same
environment as the one above):

```
nix-shell --expr "$(curl -sl https://raw.githubusercontent.com/b-rodrigues/rix/master/inst/extdata/default.nix)"
nix-shell --expr "$(curl -sl https://raw.githubusercontent.com/ropensci/rix/master/inst/extdata/default.nix)"
```

You can then create new development environment definitions, build them, and
Expand All @@ -233,7 +233,7 @@ clear.

You can also try out Nix inside Docker. To know more, read
`vignette("z-advanced-topic-using-nix-inside-docker")`
[link](https://github.com/b-rodrigues/rix/blob/HEAD/vignettes/z-advanced-topic-using-nix-inside-docker.Rmd).
[link](https://github.com/ropensci/rix/blob/HEAD/vignettes/z-advanced-topic-using-nix-inside-docker.Rmd).

## How is Nix different from Docker+renv/{groundhog}/{rang}/(Ana/Mini)Conda/Guix? or Why Nix?

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<!-- badges: start -->

[![R-hub
v2](https://github.com/b-rodrigues/rix/actions/workflows/rhub.yaml/badge.svg)](https://github.com/b-rodrigues/rix/actions/workflows/rhub.yaml/badge.svg)
v2](https://github.com/ropensci/rix/actions/workflows/rhub.yaml/badge.svg)](https://github.com/ropensci/rix/actions/workflows/rhub.yaml/badge.svg)
[![runiverse-package
rix](https://b-rodrigues.r-universe.dev/badges/rix?scale=1&color=pink&style=round)](https://b-rodrigues.r-universe.dev/rix)
[![Docs](https://img.shields.io/badge/docs-release-blue.svg)](https://b-rodrigues.github.io/rix)
Expand Down Expand Up @@ -221,7 +221,7 @@ If you don’t have R installed, but have the Nix package manager
installed, you can run a temporary R session with R using this command
(it will build the same environment as the one above):

nix-shell --expr "$(curl -sl https://raw.githubusercontent.com/b-rodrigues/rix/master/inst/extdata/default.nix)"
nix-shell --expr "$(curl -sl https://raw.githubusercontent.com/ropensci/rix/master/inst/extdata/default.nix)"

You can then create new development environment definitions, build them,
and start using them.
Expand All @@ -240,7 +240,7 @@ vignettes. Don’t hesitate to open an issue if something is not clear.

You can also try out Nix inside Docker. To know more, read
`vignette("z-advanced-topic-using-nix-inside-docker")`
[link](https://github.com/b-rodrigues/rix/blob/HEAD/vignettes/z-advanced-topic-using-nix-inside-docker.Rmd).
[link](https://github.com/ropensci/rix/blob/HEAD/vignettes/z-advanced-topic-using-nix-inside-docker.Rmd).

## How is Nix different from Docker+renv/{groundhog}/{rang}/(Ana/Mini)Conda/Guix? or Why Nix?

Expand Down
10 changes: 5 additions & 5 deletions codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"identifier": "rix",
"description": "Provides helper functions to create reproducible development environments using the Nix package manager.",
"name": "rix: Rix: Reproducible Environments with Nix",
"codeRepository": "https://github.com/b-rodrigues/rix",
"issueTracker": "https://github.com/b-rodrigues/rix",
"codeRepository": "https://github.com/ropensci/rix",
"issueTracker": "https://github.com/ropensci/rix",
"license": "https://spdx.org/licenses/GPL-3.0",
"version": "0.5.1.9000",
"programmingLanguage": {
Expand Down Expand Up @@ -141,7 +141,7 @@
},
"fileSize": "1016.338KB",
"relatedLink": "https://b-rodrigues.github.io/rix/",
"releaseNotes": "https://github.com/b-rodrigues/rix/blob/master/NEWS.md",
"readme": "https://github.com/b-rodrigues/rix/blob/master/README.md",
"contIntegration": ["https://github.com/b-rodrigues/rix/actions/workflows/R-CMD-check.yaml", "https://github.com/b-rodrigues/rix/actions?query=workflow%3Apkgcheck"]
"releaseNotes": "https://github.com/ropensci/rix/blob/master/NEWS.md",
"readme": "https://github.com/ropensci/rix/blob/master/README.md",
"contIntegration": ["https://github.com/ropensci/rix/actions/workflows/R-CMD-check.yaml", "https://github.com/ropensci/rix/actions?query=workflow%3Apkgcheck"]
}
2 changes: 1 addition & 1 deletion default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
# edge packages and R.
# Only use bleeding edge packages if absolutely needed!
# Read more on https://b-rodrigues.github.io/rix/articles/z-bleeding_edge.html
# Report any issues to https://github.com/b-rodrigues/rix
# Report any issues to https://github.com/ropensci/rix
let
pkgs = import (fetchTarball "https://github.com/rstats-on-nix/nixpkgs/archive/refs/heads/r-daily.tar.gz") {};

Expand Down
6 changes: 3 additions & 3 deletions inst/extdata/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
# with following call:
# >rix(r_ver = "976fa3369d722e76f37c77493d99829540d43845",
# > git_pkgs = list(package_name = "rix",
# > repo_url = "https://github.com/b-rodrigues/rix/",
# > repo_url = "https://github.com/ropensci/rix/",
# > commit = "99d40737d09a407c2c935437cc5c3d89bdea326a"),
# > ide = "other",
# > project_path = "inst/extdata",
# > overwrite = TRUE)
# It uses nixpkgs' revision 976fa3369d722e76f37c77493d99829540d43845 for reproducibility purposes
# which will install R version 4.3.1.
# Report any issues to https://github.com/b-rodrigues/rix
# Report any issues to https://github.com/ropensci/rix
let
pkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/976fa3369d722e76f37c77493d99829540d43845.tar.gz") {};

git_archive_pkgs = [
(pkgs.rPackages.buildRPackage {
name = "rix";
src = pkgs.fetchgit {
url = "https://github.com/b-rodrigues/rix/";
url = "https://github.com/ropensci/rix/";
rev = "99d40737d09a407c2c935437cc5c3d89bdea326a";
sha256 = "sha256-lrPgKOXfMvjvEso/8JZmVQ3Bd/FMjIVh7mMVsIMOs0k=";
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ following line in a terminal will drop you in an interactive R session that you
can use to start generating expressions:

```
nix-shell --expr "$(curl -sl https://raw.githubusercontent.com/b-rodrigues/rix/master/inst/extdata/default.nix)"
nix-shell --expr "$(curl -sl https://raw.githubusercontent.com/ropensci/rix/master/inst/extdata/default.nix)"
```

This should immediately start an R session inside your terminal. You can now run
Expand Down Expand Up @@ -177,7 +177,7 @@ rix(
r_pkgs = NULL,
git_pkgs = list(
package_name = "rix",
repo_url = "https://github.com/b-rodrigues/rix",
repo_url = "https://github.com/ropensci/rix",
commit = "76d1bdd03d78589d399b4b9d473ecde616920a82"
),
ide = "other",
Expand Down
2 changes: 1 addition & 1 deletion vignettes/b2-setting-up-and-using-rix-on-macos.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ following line in a terminal will drop you in an interactive R session that you
can use to start generating expressions:

```
nix-shell --expr "$(curl -sl https://raw.githubusercontent.com/b-rodrigues/rix/master/inst/extdata/default.nix)"
nix-shell --expr "$(curl -sl https://raw.githubusercontent.com/ropensci/rix/master/inst/extdata/default.nix)"
```

This should immediately start an R session inside your terminal. You can now run
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ rix(
#> # > print = TRUE)
#> # It uses nixpkgs' revision 12a9c0004bc987afb1ff511ebb97b67497a68e22 for reproducibility purposes
#> # which will install R version latest.
#> # Report any issues to https://github.com/b-rodrigues/rix
#> # Report any issues to https://github.com/ropensci/rix
#> let
#> pkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/12a9c0004bc987afb1ff511ebb97b67497a68e22.tar.gz") {};
#>
Expand Down Expand Up @@ -175,7 +175,7 @@ The file looks like this:
#> # > overwrite = TRUE)
#> # It uses nixpkgs' revision 79b3d4bcae8c7007c9fd51c279a8a67acfa73a2a for reproducibility purposes
#> # which will install R version 4.2.1.
#> # Report any issues to https://github.com/b-rodrigues/rix
#> # Report any issues to https://github.com/ropensci/rix
#> let
#> pkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/79b3d4bcae8c7007c9fd51c279a8a67acfa73a2a.tar.gz") {};
#>
Expand Down
6 changes: 3 additions & 3 deletions vignettes/d1-installing-r-packages-in-a-nix-environment.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ rix(
#> # > overwrite = TRUE)
#> # It uses nixpkgs' revision 79b3d4bcae8c7007c9fd51c279a8a67acfa73a2a for reproducibility purposes
#> # which will install R version 4.2.1.
#> # Report any issues to https://github.com/b-rodrigues/rix
#> # Report any issues to https://github.com/ropensci/rix
#> let
#> pkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/79b3d4bcae8c7007c9fd51c279a8a67acfa73a2a.tar.gz") {};
#>
Expand Down Expand Up @@ -229,7 +229,7 @@ rix(
#> # > overwrite = TRUE)
#> # It uses nixpkgs' revision 79b3d4bcae8c7007c9fd51c279a8a67acfa73a2a for reproducibility purposes
#> # which will install R version 4.2.1.
#> # Report any issues to https://github.com/b-rodrigues/rix
#> # Report any issues to https://github.com/ropensci/rix
#> let
#> pkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/79b3d4bcae8c7007c9fd51c279a8a67acfa73a2a.tar.gz") {};
#>
Expand Down Expand Up @@ -385,7 +385,7 @@ rix(
#> # > overwrite = TRUE)
#> # It uses nixpkgs' revision 79b3d4bcae8c7007c9fd51c279a8a67acfa73a2a for reproducibility purposes
#> # which will install R version 4.2.1.
#> # Report any issues to https://github.com/b-rodrigues/rix
#> # Report any issues to https://github.com/ropensci/rix
#> let
#> pkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/79b3d4bcae8c7007c9fd51c279a8a67acfa73a2a.tar.gz") {};
#>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ rix(
#> # > overwrite = TRUE)
#> # It uses nixpkgs' revision 12a9c0004bc987afb1ff511ebb97b67497a68e22 for reproducibility purposes
#> # which will install R version latest.
#> # Report any issues to https://github.com/b-rodrigues/rix
#> # Report any issues to https://github.com/ropensci/rix
#> let
#> pkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/12a9c0004bc987afb1ff511ebb97b67497a68e22.tar.gz") {};
#>
Expand Down Expand Up @@ -114,7 +114,7 @@ You can look for all the available software
[here](https://search.nixos.org/packages?channel=unstable&from=0&size=50&sort=relevance&type=packages&query=).
Simply look for the right package name, and add it to the `system_pkgs` argument
of `rix()`. If you have trouble finding something, don’t hesitate to
[open an issue ](https://github.com/b-rodrigues/rix/issues) and ask for support!
[open an issue ](https://github.com/ropensci/rix/issues) and ask for support!

## Installing TexLive packages

Expand Down Expand Up @@ -149,7 +149,7 @@ rix(
#> # > print = TRUE)
#> # It uses nixpkgs' revision 12a9c0004bc987afb1ff511ebb97b67497a68e22 for reproducibility purposes
#> # which will install R version latest.
#> # Report any issues to https://github.com/b-rodrigues/rix
#> # Report any issues to https://github.com/ropensci/rix
#> let
#> pkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/12a9c0004bc987afb1ff511ebb97b67497a68e22.tar.gz") {};
#>
Expand Down
2 changes: 1 addition & 1 deletion vignettes/e-interactive-use.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ expressions. In this case you might consider installing Nix first, and then run
the following command inside your terminal to get dropped into a temporary Nix
shell, which you can then use to generate new `default.nix` files:

nix-shell --expr "$(curl -sl https://raw.githubusercontent.com/b-rodrigues/rix/master/inst/extdata/default.nix)"
nix-shell --expr "$(curl -sl https://raw.githubusercontent.com/ropensci/rix/master/inst/extdata/default.nix)"

Running the command above will download R and `{rix}` and then start an R
session inside your terminal. You can now run something like this:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,6 @@ reasons:

Because of these reasons, we believe that it is safer for users that really need
to use such packages to manually edit their Nix expressions. Don't hesitate to
[open an issue](https://github.com/b-rodrigues/rix/issues) if you require
[open an issue](https://github.com/ropensci/rix/issues) if you require
assistance.

4 changes: 2 additions & 2 deletions vignettes/z-advanced-topic-using-nix-inside-docker.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ RUN apt install curl -y
# We don't have R nor {rix} in this image, so we can bootstrap it by downloading
# the default.nix file that comes with {rix}. You can also download it beforehand
# and then copy it to the Docker image
RUN curl -O https://raw.githubusercontent.com/b-rodrigues/rix/master/inst/extdata/default.nix
RUN curl -O https://raw.githubusercontent.com/ropensci/rix/master/inst/extdata/default.nix
# Copy a script to generate the environment of interest using {rix}
COPY generate_env.R .
Expand Down Expand Up @@ -106,7 +106,7 @@ RUN apt update -y
RUN apt install curl -y
# Get a default.nix with R and rix
RUN curl -O https://raw.githubusercontent.com/b-rodrigues/rix/master/inst/extdata/default.nix
RUN curl -O https://raw.githubusercontent.com/ropensci/rix/master/inst/extdata/default.nix
# Copy a script to generate the environment of interest using rix
COPY generate_env.R .
Expand Down
2 changes: 1 addition & 1 deletion vignettes/z-binary_cache.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -134,5 +134,5 @@ NixOS's public cache, our `rstats-on-nix` cache, and your own, so your cache
will only end up holding the binaries not found in the other two caches!

Take a look at
[this package’s](https://github.com/b-rodrigues/rix/blob/master/.github/workflows/cachix_dev_env.yml)
[this package’s](https://github.com/ropensci/rix/blob/master/.github/workflows/cachix_dev_env.yml)
repository for an example of how this is done in practice.

0 comments on commit 00e6cd0

Please sign in to comment.