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

zola: 0.18 -> 0.19.1 #325370

Closed
wants to merge 1 commit into from
Closed

Conversation

SIGSTACKFAULT
Copy link

@SIGSTACKFAULT SIGSTACKFAULT commented Jul 7, 2024

Description of changes

My first nixpkgs contribution so please be gentle. Skipping 0.19 because it had a bug in zola watch.
Requires Rust 1.79 #320250.

Changelog: here

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@AndersonTorres
Copy link
Member

AndersonTorres commented Jul 7, 2024

Requires rust 1.79 which hasn't shipped in nixpkgs yet so used rust-overlay.

So let's wait an update on Rust instead.
We do not bring external dependencies this way.

Close or at least put it on draft.

@SIGSTACKFAULT
Copy link
Author

SIGSTACKFAULT commented Jul 7, 2024

We do not bring external dependencies this way.

I blame the Nix Matrix room

@NixOSInfra NixOSInfra added the 12. first-time contribution This PR is the author's first one; please be gentle! label Jul 7, 2024
@AndersonTorres
Copy link
Member

Show them the log :)

https://github.com/NixOS/nixpkgs/actions/runs/9830902488/job/27137607321?pr=325370

Run if result/bin/nixpkgs-check-by-name --base "$base" .; then
pkgs/by-name/zo/zola: File package.nix at line 1 contains the nix search path expression "" which may point outside the directory of that package.
This PR introduces the problems listed above. Please fix them before merging, otherwise the base branch would break.
To run locally: ./maintainers/scripts/check-by-name.sh master https://github.com/NixOS/nixpkgs.git
Error: Process completed with exit code 1.

Copy link
Member

@Frontear Frontear left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not the correct way to pull in dependencies.

From what I can gather from this pr, rust 1.79 has already hit master. I haven't personally verified it but do check this out.

@AndersonTorres
Copy link
Member

rust 1.79 has already hit master.

In mere two days??

@Frontear
Copy link
Member

Frontear commented Jul 7, 2024

rust 1.79 has already hit master.

In mere two days??

hah, just realized both that it targeted staging and that it was only 2 days ago. Good news for OP then, it'll roll in soon, can leave PR open but remove the IFDs

@SIGSTACKFAULT
Copy link
Author

rust 1.79 has already hit master.

didn't work when i tried it, but maybe that's because I was doing the build wrong. nix-build -A zola

@AndersonTorres
Copy link
Member

Let's wait a bit more.

Skipping 0.19.0 because it had a bug in `zola watch`.
@SIGSTACKFAULT
Copy link
Author

Y'all want me to mark it as draft, or do you have a "blocked" label, or what?

Copy link
Member

@Frontear Frontear left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great! Waiting on Rust 1.79 to hit mainline before it can be merged. Congrats on the new PR!

@Frontear Frontear added 2.status: blocked by pr/issue Another PR or issue is preventing this from being completed and removed 2.status: blocked by pr/issue Another PR or issue is preventing this from being completed labels Jul 7, 2024
@AndersonTorres
Copy link
Member

Y'all want me to mark it as draft, or do you have a "blocked" label, or what?

We usually ask to mark as draft to indicate a "waiting state".

@alyssais
Copy link
Member

1.79 is already in staging-next, so this could be merged there now. (But if you do change the base branch, make sure you follow the documentation for how to do so without accidentally mass pinging people.)

@honnip
Copy link
Contributor

honnip commented Jul 28, 2024

rust 1.79 is on master now

Result of nixpkgs-review pr 325370 run on x86_64-linux 1

1 package built:
  • zola

@AndersonTorres
Copy link
Member

@SIGSTACKFAULT feel free to undraft.

@donovanglover
Copy link
Member

Superseded by #332403.

@SIGSTACKFAULT
Copy link
Author

@AndersonTorres sorry, wasn't checking GH due to finals

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants