Skip to content

update nullkomma and remove resolved workarounds #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxheld83 merged 1 commit into from
Oct 27, 2026
+6 −31
Merged

update nullkomma and remove resolved workarounds #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions flake.lock
View file
Open in desktop

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

27 changes: 1 addition & 26 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
function = "counter_button_app";
};
nullkomma.r.pkgdown.brand.enable = true;
nullkomma.r.allowOffNixpkgs = true;
nullkomma.r.check.args = [
"--no-manual"
"--ignore-vignettes"
Expand All @@ -42,7 +41,7 @@
nullkomma.r.hashes.rdtools = "sha256-8BQ/3Vdl1vndn4BNdoHfjo4TP4ioBWv3Y1bZu22ej70=";

perSystem =
{ config, pkgs, ... }:
{ config, ... }:
let
testEnvironment = ''
export SHINYTEST2_LOAD_TIMEOUT=16000 SHINYTEST2_TIMEOUT=8000
Expand All @@ -51,30 +50,6 @@
'';
in
{
nullkomma.r.browser = lib.mkIf pkgs.stdenv.isLinux (
pkgs.writeShellApplication {
name = "crow-chromium";
text = ''
export FONTCONFIG_FILE=${
pkgs.makeFontsConf {
fontDirectories = [
pkgs.liberation_ttf
pkgs.dejavu_fonts
];
}
}
exec ${lib.getExe pkgs.chromium} "$@"
'';
}
);
# Elf's native-R profile must not hide Nix's build dependencies.
nullkomma.r.buildInputs.elf = [
(pkgs.writeTextFile {
name = "elf-nix-startup";
destination = "/nix-support/setup-hook";
text = "export NULLKOMMA_R_NIX=true";
})
];
nullkomma.devShell.shellHook = testEnvironment;
nullkomma.checks = {
r-cmd-check.command = lib.mkBefore testEnvironment;
Expand Down