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.

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

quarto: init at 1.1.189 #186697

Merged
merged 3 commits into from
Sep 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 0 deletions maintainers/maintainer-list.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8920,6 +8920,12 @@
githubId = 15896005;
name = "Vladyslav Burzakovskyy";
};
mrtarantoga = {
email = "goetz-dev@web.de";
name = "Götz Grimmer";
github = "MrTarantoga";
githubId = 53876219;
};
mrVanDalo = {
email = "contact@ingolf-wagner.de";
github = "mrVanDalo";
Expand Down
68 changes: 68 additions & 0 deletions pkgs/development/libraries/quarto/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{ stdenv
, lib
, pandoc
, esbuild
, deno
, fetchurl
, nodePackages
, rWrapper
, rPackages
, makeWrapper
MrTarantoga marked this conversation as resolved.
Show resolved Hide resolved
, python3
}:

stdenv.mkDerivation rec {
pname = "quarto";
version = "1.1.189";
src = fetchurl {
url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${version}/quarto-${version}-linux-amd64.tar.gz";
sha256 = "1a3xsgqdccm4ky1xjnin1idpp8gsansskq37c00mrxz1raxn1mi7";
};

nativeBuildInputs = [
makeWrapper
];

patches = [
./fix-deno-path.patch
];

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 : ${nodePackages.sass}/bin/sass \
--prefix QUARTO_R : ${rWrapper.override { packages = [ rPackages.rmarkdown]; }}/bin/R \
--prefix QUARTO_PYTHON : ${python3.withPackages (ps: with ps; [ jupyter ipython ])}/bin/python3
'';

installPhase = ''
smancill marked this conversation as resolved.
Show resolved Hide resolved
runHook preInstall

mkdir -p $out/bin $out/share

rm -r bin/tools

mv bin/* $out/bin
mv share/* $out/share

runHook preInstall
'';

meta = with lib; {
description = "Open-source scientific and technical publishing system built on Pandoc";
longDescription = ''
Quarto is an open-source scientific and technical publishing system built on Pandoc.
Quarto documents are authored using markdown, an easy to write plain text format.
'';
homepage = "https://quarto.org/";
changelog = "https://github.com/quarto-dev/quarto-cli/releases/tag/v${version}";
license = licenses.gpl2Plus;
maintainers = with maintainers; [ mrtarantoga ];
platforms = [ "x86_64-linux" ];
sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ];
};
}
8 changes: 8 additions & 0 deletions pkgs/development/libraries/quarto/fix-deno-path.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
--- 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}" "$@"
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20790,6 +20790,8 @@ with pkgs;

qolibri = libsForQt5.callPackage ../applications/misc/qolibri { };

quarto = callPackage ../development/libraries/quarto { };

qt4 = qt48;

qt48 = callPackage ../development/libraries/qt-4.x/4.8 {
Expand Down