-
-
Notifications
You must be signed in to change notification settings - Fork 13.3k
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
quarto: init at 1.1.189 #186697
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please also rearrange your commits to have the one adding yourself to the maintainer list first, then squash the rest into a single commit. You can use git rebase -i master
to do this easily.
a2badbb
to
1f1704c
Compare
Use the proper format for the maintainers commit message: https://nixos.org/manual/nixpkgs/stable/#var-meta-maintainers |
Do we really need to download precompiled binaries instead of building from source? What's the problem? |
Solved in 7363e4d |
Yes, the install phase of the source package does nothing else then downloading precompiled versions and install them. So, there I see no difference between the source and the distribution package. |
@MrTarantoga you did an amazing job here already, thank you! Do you think you'll get a chance to finish it some time soon? |
I'd also love to have |
I am not sure if it will work with all features. It does not find the jupyter or R environment. I have some struggle with patching the files to work as expected. The last 2 weeks I have no success with adaption. |
I have been playing around with your current patch and I encountered the same issue. Funnily enough, I found that if you add jupyter separately in a |
I managed to get Quarto to find jupyter (and other kernels, such as the IJulia one) after installing it as a python package, rather then the standard nix package. With Tex being installed it allows me to render to pdf perfectly, but it completely fails under HTML with
As far as I can tell this comes from Deno, but I have no clue what causes it. |
pkgs/top-level/all-packages.nix
Outdated
@@ -36449,4 +36449,6 @@ with pkgs; | |||
swift-corelibs-libdispatch = callPackage ../development/libraries/swift-corelibs-libdispatch { }; | |||
|
|||
swaysettings = callPackage ../applications/misc/swaysettings { }; | |||
|
|||
quarto = callPackage ../development/libraries/quarto { }; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be sorted alphabetically into the libraries section.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are not all files sorted alphabetical. Also I do not identify a special library section. I hope that is what you mean: 32c7b9f
maintainers/maintainer-list.nix
Outdated
@@ -14967,4 +14967,10 @@ | |||
github = "yisuidenghua"; | |||
githubId = 102890144; | |||
}; | |||
mrtarantoga = { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This list is sorted alphabetical.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I think quarto expect the FHS and nix does not support this standard. I am reading currently the documentation to support this, but I am not sure if it is possible. Maybe there must be patched the javscript sources. I struggle with the FHS support in nix and in its packages, it is quite hard to understand how it works. |
Did you already try to use buildFHSUserEnvBubblewrap ? |
34b719c
to
bdb1f57
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated src
and version
. Edited according to comments by @smancill and @SuperSandro2000. Adjusted QUARTO_IMPORT_ARGMAP
accordingly. Partially tested with quarto preview
.
1e26752
to
5d6eeb6
Compare
5d6eeb6
to
556de34
Compare
Can we merge it? |
Fix: Sort mrtarantoga alphabetical
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: NixOS#186697 (comment) 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 NixOS#186697 (comment) Fix wrong path for import_map.json Do not strip downloaded binary
556de34
to
3be6403
Compare
I squashed now all commits. You can merge if you want, there no constraints from my side. |
Thanks all! |
Is there a way to make the engines dependency optional? I'm not skilled in Nix yet but maybe changing |
That change wouldn't work. Also making options for everything increases the package complexity and all combinations are never tested. The best option would be if quarto would just pickup the packages from PATH and they are not set in the wrapper. |
If I recall correctly, we did manage to partially get this to work in parts atleast, but the issue was, among others, that some packages did not set their PATHs correctly.
Julia uses the We could either try and fix the jupyter pathing issue or just remove all but it (assuming R is found normally) I guess... |
FYI share is full of stuff, should probably be in a subdir
|
Description of changes
Quarto® is an open-source scientific and technical publishing system built on Pandoc
The idea is, to add quarto support to RStudio.
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notes