diff options
author | Bruno Rodrigues <bruno@brodrigues.co> | 2024-02-25 15:29:37 +0100 |
---|---|---|
committer | Bruno Rodrigues <bruno@brodrigues.co> | 2024-02-25 15:29:37 +0100 |
commit | 27b830f645e8002edb745bea303217861b80c074 (patch) | |
tree | a64712b858530d7a9010c86ee97b9999c1e065e4 /pkgs/development/libraries/quarto/default.nix | |
parent | 288dc9554fbb7b9048f1a06c946b439218af0044 (diff) |
quarto: 1.3.450 -> 1.4.550
Diffstat (limited to 'pkgs/development/libraries/quarto/default.nix')
-rw-r--r-- | pkgs/development/libraries/quarto/default.nix | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index 47cfae6482949..c9223aef6550d 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , pandoc +, typst , esbuild , deno , fetchurl @@ -18,35 +19,31 @@ stdenv.mkDerivation (final: { pname = "quarto"; - version = "1.3.450"; + version = "1.4.550"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz"; - sha256 = "sha256-bcj7SzEGfQxsw9P8WkcLrKurPupzwpgIGtxoE3KVwAU="; + sha256 = "sha256-cWHd7ZWGBdRTaSHYVa8LuTDA5gefJ5baOGERS2g6Vvg="; }; nativeBuildInputs = [ makeWrapper ]; - patches = [ - ./fix-deno-path.patch - ]; - postPatch = '' # Compat for Deno >=1.26 substituteInPlace bin/quarto.js \ - --replace 'Deno.setRaw(stdin.rid, ' 'Deno.stdin.setRaw(' \ - --replace 'Deno.setRaw(Deno.stdin.rid, ' 'Deno.stdin.setRaw(' + --replace-fail ']))?.trim();' ']))?.trim().split(" ")[0];' ''; dontStrip = true; preFixup = '' wrapProgram $out/bin/quarto \ - --prefix PATH : ${lib.makeBinPath [ deno ]} \ - --prefix QUARTO_PANDOC : ${pandoc}/bin/pandoc \ - --prefix QUARTO_ESBUILD : ${esbuild}/bin/esbuild \ - --prefix QUARTO_DART_SASS : ${dart-sass}/bin/dart-sass \ + --prefix QUARTO_DENO : ${lib.getExe deno} \ + --prefix QUARTO_PANDOC : ${lib.getExe pandoc} \ + --prefix QUARTO_ESBUILD : ${lib.getExe esbuild} \ + --prefix QUARTO_DART_SASS : ${lib.getExe dart-sass} \ + --prefix QUARTO_TYPST : ${lib.getExe typst} \ ${lib.optionalString (rWrapper != null) "--prefix QUARTO_R : ${rWrapper.override { packages = [ rPackages.rmarkdown ] ++ extraRPackages; }}/bin/R"} \ ${lib.optionalString (python3 != null) "--prefix QUARTO_PYTHON : ${python3.withPackages (ps: with ps; [ jupyter ipython ] ++ (extraPythonPackages ps))}/bin/python3"} ''; |