diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-02-26 12:32:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-26 12:32:17 +0100 |
| commit | 8c826e35a91ac04504d1d061d258ad8b35050bed (patch) | |
| tree | 1bd68f0ea598d9969d28f5d5ac3c9adb36faffdc | |
| parent | 4a88868ea6a88a1c3119853e5ddfb4d1a54300fe (diff) | |
| parent | 27b830f645e8002edb745bea303217861b80c074 (diff) | |
| download | nixlib-8c826e35a91ac04504d1d061d258ad8b35050bed.tar nixlib-8c826e35a91ac04504d1d061d258ad8b35050bed.tar.gz nixlib-8c826e35a91ac04504d1d061d258ad8b35050bed.tar.bz2 nixlib-8c826e35a91ac04504d1d061d258ad8b35050bed.tar.lz nixlib-8c826e35a91ac04504d1d061d258ad8b35050bed.tar.xz nixlib-8c826e35a91ac04504d1d061d258ad8b35050bed.tar.zst nixlib-8c826e35a91ac04504d1d061d258ad8b35050bed.zip | |
Merge pull request #263108 from b-rodrigues/quarto_1.4
| -rw-r--r-- | pkgs/development/libraries/quarto/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/development/libraries/quarto/fix-deno-path.patch | 8 |
2 files changed, 9 insertions, 20 deletions
diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index 47cfae648294..c9223aef6550 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"} ''; diff --git a/pkgs/development/libraries/quarto/fix-deno-path.patch b/pkgs/development/libraries/quarto/fix-deno-path.patch deleted file mode 100644 index 895419712ad8..000000000000 --- a/pkgs/development/libraries/quarto/fix-deno-path.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/bin/quarto -+++ b/bin/quarto -@@ -125,4 +125,4 @@ fi - # Be sure to include any already defined QUARTO_DENO_OPTIONS - QUARTO_DENO_OPTIONS="--unstable --no-config --cached-only --allow-read --allow-write --allow-run --allow-env --allow-net --allow-ffi ${QUARTO_DENO_OPTIONS}" - --"${QUARTO_DENO}" ${QUARTO_ACTION} ${QUARTO_DENO_OPTIONS} ${QUARTO_DENO_EXTRA_OPTIONS} "${QUARTO_IMPORT_ARGMAP}" "${QUARTO_TARGET}" "$@" -+deno ${QUARTO_ACTION} ${QUARTO_DENO_OPTIONS} ${QUARTO_DENO_EXTRA_OPTIONS} "${QUARTO_IMPORT_ARGMAP}" "${QUARTO_TARGET}" "$@" |