-
-
Notifications
You must be signed in to change notification settings - Fork 14.4k
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: use pandoc 3.5 #357687
quarto: use pandoc 3.5 #357687
Conversation
I assume |
@detroyejr pandoc_3_5 is already part of the Haskell package set. You can just fix the build of that via
in the Then you can use |
Yes, it's copied from the auto-generated hackage repo file. Happy to try something else if this isn't the best way forward. Edit: I'll check if the suggestion from @maralorn works. I seem to recall having difficulty with it, but was maybe doing something wrong. |
Feel free to reach out with any problems you encounter. I am confident we can find a solution. |
75410ae
to
f2b15e7
Compare
@maralorn thank you for taking the time to provide feedback. This is significantly cleaner. I've tested this on a couple of different projects and am happy with the results so I'll mark this PR as ready. |
I think this should be split into at least two commits – one to get the Pandoc package working and the other to use it in |
f2b15e7
to
775e004
Compare
Two remarks. Both are not blockers from my point of view, but you might wanna fix it. Besides that, if compiles ship it.
|
775e004
to
3f81343
Compare
I've addressed those 2 points. Pandoc was around 5GB in total now down to about 300MB so that's definitely improved. If I have time, I'll revisit the |
Okay, this is a bit wild... But I don't mind. |
Shouldn’t the Haskell stuff here be in the Haskell files like it is with our main Pandoc? |
76da74c
to
0133877
Compare
Maybe still a little wild, but I think this is moving in the right direction. |
Sorry to keep bikeshedding about this :) as I’m not too familiar with the Haskell packaging infrastructure, but I just realized that this stuff is in To reduce code duplication, how does this sound?
This avoids any copy‐pasting and keeps the concerns nicely separated. |
f475491
to
74fea36
Compare
Not a problem! Yeah that looks much better. Edit: Maybe could use 3 commits now instead of 2 splitting out fixing the haskell build and adding pandoc_3_5 cli. Let me know if you'd prefer that. |
I do like 3 commits, and I like @maralorn’s suggestion, but I’m otherwise very happy with this :) |
74fea36
to
4087d61
Compare
Cool to see so much improvement in one review process. Lgtm |
Thanks for all your help! |
4087d61
to
b0d8383
Compare
b0d8383
to
093558f
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.
I can't comment on the haskell-specific stuff but the diff generally LGTM.
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.
I think we’ve bikeshedded this one enough for now and it seems like a sensible fix :) Thanks for this!
Any chance this could get merged? It looks like there's no outstanding work to do |
Yes please! I was about to ask the same this week. 😊 |
Successfully created backport PR for |
@emilazy are you sure this should be backported? |
Following up after the work done in #349683, we're updating the version of pandoc to 3.5 outside of Haskell's normal release cycle in order to improve compatibility with quarto.
Things done
Built and tested the result against the example given by @shriv https://github.com/shriv/quarto-1-6-30-pdf-reprex to make sure 3.5 renders the PDF document correctly.
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.