diff --git a/flake.lock b/flake.lock index 29ece58..9c27964 100644 --- a/flake.lock +++ b/flake.lock @@ -121,12 +121,12 @@ "up": "up" }, "locked": { - "lastModified": 1793051552, - "narHash": "sha256-2vsibE2BVtODcFc3EtR/1pduAFRWtSQM4ufTOnIsU4U=", - "rev": "aa86b528fe08dc171af80889f35c01d5775cac55", - "revCount": 536, + "lastModified": 1793084199, + "narHash": "sha256-fdNusIwrs76leC5c+kicfPzMCm9/RDWoZyck7+zW9ZM=", + "rev": "b6971c3ecc522b70e724210b67e8ca77a3f2e4f4", + "revCount": 552, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/dataheld/nullkomma/0.1.536%2Brev-aa86b528fe08dc171af80889f35c01d5775cac55/01a17a41-c539-7441-8ed3-a70328b92a9b/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/dataheld/nullkomma/0.1.552%2Brev-b6971c3ecc522b70e724210b67e8ca77a3f2e4f4/01a17c2f-23d4-7ab3-a1ad-510f75d72d8b/source.tar.gz" }, "original": { "type": "tarball", diff --git a/flake.nix b/flake.nix index f25821a..2ee229d 100644 --- a/flake.nix +++ b/flake.nix @@ -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" @@ -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 @@ -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;