pyrox.dev
Merge pull request #263108 from b-rodrigues/quarto_1.4
+9
-12
pkgs/development/libraries/quarto/default.nix
+9
-12
pkgs/development/libraries/quarto/default.nix
···
1
1
{ stdenv
2
2
, lib
3
3
, pandoc
4
+
, typst
4
5
, esbuild
5
6
, deno
6
7
, fetchurl
···
18
19
19
20
stdenv.mkDerivation (final: {
20
21
pname = "quarto";
21
-
version = "1.3.450";
22
+
version = "1.4.550";
22
23
src = fetchurl {
23
24
url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz";
24
-
sha256 = "sha256-bcj7SzEGfQxsw9P8WkcLrKurPupzwpgIGtxoE3KVwAU=";
25
+
sha256 = "sha256-cWHd7ZWGBdRTaSHYVa8LuTDA5gefJ5baOGERS2g6Vvg=";
25
26
};
26
27
27
28
nativeBuildInputs = [
28
29
makeWrapper
29
30
];
30
31
31
-
patches = [
32
-
./fix-deno-path.patch
33
-
];
34
-
35
32
postPatch = ''
36
33
# Compat for Deno >=1.26
37
34
substituteInPlace bin/quarto.js \
38
-
--replace 'Deno.setRaw(stdin.rid, ' 'Deno.stdin.setRaw(' \
39
-
--replace 'Deno.setRaw(Deno.stdin.rid, ' 'Deno.stdin.setRaw('
35
+
--replace-fail ']))?.trim();' ']))?.trim().split(" ")[0];'
40
36
'';
41
37
42
38
dontStrip = true;
43
39
44
40
preFixup = ''
45
41
wrapProgram $out/bin/quarto \
46
-
--prefix PATH : ${lib.makeBinPath [ deno ]} \
47
-
--prefix QUARTO_PANDOC : ${pandoc}/bin/pandoc \
48
-
--prefix QUARTO_ESBUILD : ${esbuild}/bin/esbuild \
49
-
--prefix QUARTO_DART_SASS : ${dart-sass}/bin/dart-sass \
42
+
--prefix QUARTO_DENO : ${lib.getExe deno} \
43
+
--prefix QUARTO_PANDOC : ${lib.getExe pandoc} \
44
+
--prefix QUARTO_ESBUILD : ${lib.getExe esbuild} \
45
+
--prefix QUARTO_DART_SASS : ${lib.getExe dart-sass} \
46
+
--prefix QUARTO_TYPST : ${lib.getExe typst} \
50
47
${lib.optionalString (rWrapper != null) "--prefix QUARTO_R : ${rWrapper.override { packages = [ rPackages.rmarkdown ] ++ extraRPackages; }}/bin/R"} \
51
48
${lib.optionalString (python3 != null) "--prefix QUARTO_PYTHON : ${python3.withPackages (ps: with ps; [ jupyter ipython ] ++ (extraPythonPackages ps))}/bin/python3"}
52
49
'';
-8
pkgs/development/libraries/quarto/fix-deno-path.patch
-8
pkgs/development/libraries/quarto/fix-deno-path.patch
···
1
-
--- a/bin/quarto
2
-
+++ b/bin/quarto
3
-
@@ -125,4 +125,4 @@ fi
4
-
# Be sure to include any already defined QUARTO_DENO_OPTIONS
5
-
QUARTO_DENO_OPTIONS="--unstable --no-config --cached-only --allow-read --allow-write --allow-run --allow-env --allow-net --allow-ffi ${QUARTO_DENO_OPTIONS}"
6
-
7
-
-"${QUARTO_DENO}" ${QUARTO_ACTION} ${QUARTO_DENO_OPTIONS} ${QUARTO_DENO_EXTRA_OPTIONS} "${QUARTO_IMPORT_ARGMAP}" "${QUARTO_TARGET}" "$@"
8
-
+deno ${QUARTO_ACTION} ${QUARTO_DENO_OPTIONS} ${QUARTO_DENO_EXTRA_OPTIONS} "${QUARTO_IMPORT_ARGMAP}" "${QUARTO_TARGET}" "$@"