MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 06:45:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

quarto: init at 1.1.189

Browse source 
Quarto is a library/support package for several pandoc projects.
Fix: Remove trailing whitespace


Add final newline to default.nix


Fix indention and newline errors


Fix: Missed unpackPhase resolved


Add: sourceProvenance

Suggestion of: https://github.com/NixOS/nixpkgs/pull/186697#discussion_r945336064
Fix: reduce imports


Fix: use version attribute in download string


Fix: reduce path expression


Fix: add runHook {pre/post}Install as common practice


Fix: replace gpl2 with gpl2Plus


Fix: change maintainers description


Fix: do not use symlinks, use the PATH instead


Fix wrong platforms

++ means  concatenation and is not correct in this context.

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Change structure to support fixed output derivations

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Fix


Fix


Apply suggestion

Co-authored-by: Suwon Park <35622998+sepiabrown@users.noreply.github.com>
Fix suggestion


Bundle makeProgram function call

Co-authored-by: Suwon Park <35622998+sepiabrown@users.noreply.github.com>
Update library version from 1.0.38 to 1.1.189

Co-authored-by: Suwon Park <35622998+sepiabrown@users.noreply.github.com>
Add missing dependencies

Co-authored-by: Suwon Park <35622998+sepiabrown@users.noreply.github.com>
pandoc, deno, esbuild can be hooked into QUARTO_* environment variables, so they are not needed in buildInputs.

Co-authored-by: Suwon Park <35622998+sepiabrown@users.noreply.github.com>
Fix deno-path patch

Co-authored-by: Suwon Park <35622998+sepiabrown@users.noreply.github.com>
Remove wrong spaces


Add python3 jupyter host support


Fix spacing

Co-authored-by: Suwon Park <35622998+sepiabrown@users.noreply.github.com>
Sort quarto in all-packages.nix alphabetical

Remove lib prefix from maintainers

Co-authored-by: Sebastián Mancilla <238528+smancill@users.noreply.github.com>
Simplify mkdir command

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Fix missusage of makeBinPath

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Remove python3Packages -> not used

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Remove punctuation from description

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Fix review 

Error in https://github.com/NixOS/nixpkgs/pull/186697#discussion_r975107345
Fix wrong path for import_map.json


Do not strip downloaded binary
This commit is contained in:
Goetz 2022-09-25 10:59:54 +02:00
parent 2bc8cde508
commit 3be6403126
3 changed files with 78 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
pkgs/development/libraries/quarto/default.nix Normal file
View file

@ -0,0 +1,68 @@
{ stdenv
, lib
, pandoc
, esbuild
, deno
, fetchurl
, nodePackages
, rWrapper
, rPackages
, makeWrapper
, 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 = ''
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
pkgs/development/libraries/quarto/fix-deno-path.patch Normal file
View file

@ -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
pkgs/top-level/all-packages.nix
View file

@ -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 {