Skip to content
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

chore(deps): bump to latest quarto and also bump other deps and regen lockfiles #10779

Merged
merged 2 commits into from
Feb 3, 2025
Merged

chore(deps): bump to latest quarto and also bump other deps and regen lockfiles #10779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d61c92c
chore(deps): bump to latest quarto and also bump other deps and regen…
cpcloud Feb 2, 2025
59d26e4
chore(deps): `which` is now required
cpcloud Feb 3, 2025
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
6 changes: 3 additions & 3 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.

12 changes: 7 additions & 5 deletions nix/quarto/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
, rPackages
, autoPatchelfHook
, libgcc
, which
}:

let
Expand All @@ -18,9 +19,9 @@ let
x86_64-darwin = aarch64-darwin;
};
shas = rec {
x86_64-linux = "sha256-15fHlnE6V8FNgRX0mkXWJqFkeGlwlqBCHy0tmA5fnUo=";
aarch64-linux = "sha256-yzzaMnKyeEGGI3Col7iD6FAF3a6bXlfsE8EHmNRu4LY=";
aarch64-darwin = "sha256-W0IvOWdW7g7iaJcK6FF3X+1+EAWuqYUA1Zt/Es2aThY=";
x86_64-linux = "sha256-Pf3BUeffHMkiqWY4QpzU/sZjWTZIJL0x0cWFcogH6W0=";
aarch64-linux = "sha256-m3fZMw+z7IRMFtsC9iBILJbhZ+WFBPP0RUQ6ZsV3Y5E=";
aarch64-darwin = "sha256-Tm/oj5NMuiQQBJj71FhXiIN1Pc61RzzvBQM9zUY7o60=";
# hashes are the same for both macos architectures, because the packages
# are identical
x86_64-darwin = aarch64-darwin;
Expand All @@ -29,7 +30,7 @@ let
in
stdenv.mkDerivation rec {
pname = "quarto";
version = "1.6.39";
version = "1.7.13";
src = fetchurl {
url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${version}/quarto-${version}-${platforms.${system}}.tar.gz";
sha256 = shas.${system};
Expand All @@ -54,7 +55,8 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/quarto \
--prefix QUARTO_ESBUILD : ${lib.getExe esbuild} \
--prefix QUARTO_R : ${lib.getExe' rEnv "R"} \
--prefix QUARTO_DART_SASS : ${lib.getExe dart-sass}
--prefix QUARTO_DART_SASS : ${lib.getExe dart-sass} \
--prefix PATH : ${lib.makeBinPath [ which ]}
'';

installPhase = ''
Expand Down
14 changes: 7 additions & 7 deletions requirements-dev.txt
View file
Open in desktop

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

43 changes: 22 additions & 21 deletions uv.lock
View file
Open in desktop

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