fix default.nix

facebookincubator · May 14, 2024 · 0a0e5e1 · 0a0e5e1
1 parent 6ef41fd
commit 0a0e5e1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/build-metrics.yml b/.github/workflows/build-metrics.yml
@@ -149,6 +149,7 @@ jobs:
         run: |
           cd scripts/bm-report
           nix-shell --run "quarto render report.Rmd"
+          nix-shell --run "quarto --version"
 
       - name: Push Documentation
         # if: ${{ github.event_name == 'push' && github.repository == 'facebookincubator/velox'}}

diff --git a/scripts/bm-report/default.nix b/scripts/bm-report/default.nix
@@ -1,7 +1,7 @@
-# This file was generated by the {rix} R package v0.6.0 on 2024-05-14
+# This file was generated by the {rix} R package v0.6.0 on 2024-05-15
 # with following call:
 # >rix::rix(r_ver = "abd6d48f8c77bea7dc51beb2adfa6ed3950d2585",
-#  > r_pkgs = install.packages(c("dplyr",
+#  > r_pkgs = c("dplyr",
 #  > "prettyunits",
 #  > "ggplot2",
 #  > "gh",
@@ -13,7 +13,7 @@
 #  > "memoise",
 #  > "plotly",
 #  > "purrr",
-#  > "remotes")),
+#  > "remotes"),
 #  > system_pkgs = c("quarto"),
 #  > git_pkgs = list(package_name = "conbenchcoms",
 #  > repo_url = "https://github.com/conbench/conbenchcoms",
@@ -28,7 +28,10 @@
 # Report any issues to https://github.com/b-rodrigues/rix
 let
  pkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/abd6d48f8c77bea7dc51beb2adfa6ed3950d2585.tar.gz") {};
-  git_archive_pkgs = [(pkgs.rPackages.buildRPackage {
+ rpkgs = builtins.attrValues {
+  inherit (pkgs.rPackages) dplyr prettyunits ggplot2 gh gt hms jqr jsonlite lubridate memoise plotly quarto purrr remotes;
+};
+ git_archive_pkgs = [(pkgs.rPackages.buildRPackage {
     name = "conbenchcoms";
     src = pkgs.fetchgit {
       url = "https://github.com/conbench/conbenchcoms";
@@ -41,7 +44,7 @@ let
     };
   }) ];
   system_packages = builtins.attrValues {
-  inherit (pkgs) R glibcLocales nix quartoMinimal which;
+  inherit (pkgs) R glibcLocales nix quartoMinimal;
 };
   in
   pkgs.mkShell {
@@ -53,6 +56,6 @@ let
     LC_PAPER = "en_US.UTF-8";
     LC_MEASUREMENT = "en_US.UTF-8";
 
-    buildInputs = [ git_archive_pkgs   system_packages  ];
-      
+    buildInputs = [ git_archive_pkgs rpkgs  system_packages  ];
+
   }