From c55358fdf1ab70256699c74bb5e22713b2ab4094 Mon Sep 17 00:00:00 2001 From: "ibis-squawk-bot[bot]" <96536427+ibis-squawk-bot[bot]@users.noreply.github.com> Date: Mon, 14 Oct 2024 10:00:33 -0400 Subject: [PATCH] chore(deps): update `flake.lock` (#10309) Co-authored-by: github-actions[bot] Co-authored-by: Phillip Cloud <417981+cpcloud@users.noreply.github.com> --- .github/workflows/docs-preview.yml | 3 +++ .github/workflows/ibis-docs-main.yml | 3 +++ .github/workflows/ibis-docs-pr.yml | 3 +++ flake.lock | 6 +++--- nix/quarto/default.nix | 18 +++++++++--------- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/.github/workflows/docs-preview.yml b/.github/workflows/docs-preview.yml index 2fe5a79bcb1f..677bfda7c344 100644 --- a/.github/workflows/docs-preview.yml +++ b/.github/workflows/docs-preview.yml @@ -76,6 +76,9 @@ jobs: key: docs-${{ github.event.pull_request.base.sha }} path: docs/**/.jupyter_cache + - name: run quarto check + run: nix develop '.#ibis311' --ignore-environment -c quarto check + - name: build docs run: nix develop '.#ibis311' --ignore-environment --keep HOME -c just docs-build-all diff --git a/.github/workflows/ibis-docs-main.yml b/.github/workflows/ibis-docs-main.yml index 421007118814..97bdb064e73d 100644 --- a/.github/workflows/ibis-docs-main.yml +++ b/.github/workflows/ibis-docs-main.yml @@ -68,6 +68,9 @@ jobs: key: docs-${{ github.event.before }} path: docs/**/.jupyter_cache + - name: run quarto check + run: nix develop '.#ibis311' --ignore-environment -c quarto check + - name: build api docs run: nix develop '.#ibis311' --ignore-environment -c just docs-apigen --verbose diff --git a/.github/workflows/ibis-docs-pr.yml b/.github/workflows/ibis-docs-pr.yml index d7fccb7177ac..c4e3ed99ae23 100644 --- a/.github/workflows/ibis-docs-pr.yml +++ b/.github/workflows/ibis-docs-pr.yml @@ -66,6 +66,9 @@ jobs: key: docs-${{ github.event.pull_request.base.sha }} path: docs/**/.jupyter_cache + - name: run quarto check + run: nix develop '.#ibis311' --ignore-environment -c quarto check + - name: generate api docs run: nix develop '.#ibis311' --ignore-environment -c just docs-apigen --verbose diff --git a/flake.lock b/flake.lock index 962b477a59db..11c2ce9c9cdc 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728534991, - "narHash": "sha256-wLUZyvtOOowAz0kTrU2MoC4nXWniFaVezGyzuEt5HPc=", + "lastModified": 1728848132, + "narHash": "sha256-tKP8qegEdEGEnSZnrBGaxfUuOaSsMefV82phOn2wEcQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6b955bdbb9efe4a5c047746323951fe1bdf8d01b", + "rev": "ae88a0775335e6b66016565543392a7575923644", "type": "github" }, "original": { diff --git a/nix/quarto/default.nix b/nix/quarto/default.nix index dd731a17626d..53e430a7312c 100644 --- a/nix/quarto/default.nix +++ b/nix/quarto/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , esbuild -, deno +, deno_1 , fetchurl , dart-sass , makeWrapper @@ -17,15 +17,15 @@ let "aarch64-darwin" = "macos"; }; shas = { - "x86_64-linux" = "sha256-qSQc8Qw2ah0Kbrcb0kNuFTSQB3d7dnVPRRViA7//mgE="; - "aarch64-linux" = "sha256-PZfVCZf6XOUMaMOmIyBe1CrPTKQv53jf2RzunZN6RNk="; - "aarch64-darwin" = "sha256-LCROmrVuYBI4FE1K+c/mo8S7YEJ02puqlSHLcuRLEXc="; + "x86_64-linux" = "sha256-4PgvIPExU6FTaGB5gOSt/InJ9wftVas5OSlvtbW4Rm4="; + "aarch64-linux" = "sha256-7hrySIJREoVuqPQfLYxR0cqT82oocYgB1Gbi4Rbh3ns="; + "aarch64-darwin" = "sha256-BcliqrsJQrP2xjTMv+jqQziQTD7nQap4IAIp2R8ZVCM="; }; inherit (stdenv.hostPlatform) system; in stdenv.mkDerivation rec { pname = "quarto"; - version = "1.6.15"; + version = "1.6.25"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${version}/quarto-${version}-${platforms.${system}}.tar.gz"; sha256 = shas.${system}; @@ -45,10 +45,10 @@ stdenv.mkDerivation rec { in '' wrapProgram $out/bin/quarto \ - --prefix QUARTO_ESBUILD : ${esbuild}/bin/esbuild \ - --prefix QUARTO_DENO : ${deno}/bin/deno \ - --prefix QUARTO_R : ${rEnv}/bin/R \ - --prefix QUARTO_DART_SASS : ${dart-sass}/bin/dart-sass + --prefix QUARTO_ESBUILD : ${lib.getExe esbuild} \ + --prefix QUARTO_DENO : ${lib.getExe deno_1} \ + --prefix QUARTO_R : ${lib.getExe' rEnv "R"} \ + --prefix QUARTO_DART_SASS : ${lib.getExe dart-sass} ''; installPhase = ''