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

rwalk: init at 0.9.0 #366586

Merged
merged 7 commits into from
Dec 31, 2024
Merged

rwalk: init at 0.9.0 #366586

merged 7 commits into from
Dec 31, 2024

Conversation

pwnwriter
Copy link
Member

Description of changes

A blazingly fast web directory scanner written in Rust

https://github.com/cestef/rwalk

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.

pkgs/by-name/rw/rwalk/package.nix Outdated Show resolved Hide resolved
@steeleduncan
Copy link
Contributor

@pwnwriter Looks good to me, but I don't have commit access, and don't maintain a similar package, so it doesn't make sense for me to leave an approving review. Once the tests have passed, my suggestion to get it merged would be to find someone who has merged a rust tool comparable to this into nixpkgs recently, and ping them for a review

@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1 10.rebuild-linux: 1 labels Dec 22, 2024
@pwnwriter
Copy link
Member Author

@drupol, could you please check and merge ? Appreciate it :)

@drupol drupol requested a review from GaetanLepage December 29, 2024 16:56
@drupol
Copy link
Contributor

drupol commented Dec 29, 2024

IIRC, embedding the cargo.lock file is not necessary any more. Have a look at https://github.com/NixOS/nixpkgs/blob/nixos-24.11/pkgs/by-name/ty/typst/package.nix#L79

pkgs/by-name/rw/rwalk/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/rw/rwalk/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/rw/rwalk/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/rw/rwalk/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/rw/rwalk/package.nix Show resolved Hide resolved
pwnwriter and others added 4 commits December 30, 2024 10:03
Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>
Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>
Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>
Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>
@pwnwriter
Copy link
Member Author

@GaetanLepage , I've committed the requested changes, But the ci fails now. Could you please guide me on this?

@drupol
Copy link
Contributor

drupol commented Dec 30, 2024

@GaetanLepage , I've committed the requested changes, But the ci fails now. Could you please guide me on this?

Run nixfmt-rfc-style on your nix file to fix the formatting

Co-authored-by: Gaétan Lepage <33058747+GaetanLepage@users.noreply.github.com>
@pwnwriter
Copy link
Member Author

should I now remove the lock file?

@GaetanLepage
Copy link
Contributor

GaetanLepage commented Dec 30, 2024

should I now remove the lock file?

Yes. Also, replace the "..." with the correct hash.
And add

passthru = {
  updateScript = nix-update-script { };
};

just before meta =

@pwnwriter
Copy link
Member Author

@GaetanLepage Could you tell me how'd I retrieve the cargo hash? I thought it'll provide me if I try to build it. But yeah, I'm getting issue with nix-update-script not sure If it's intended.

Screenshot 2024-12-30 at 5 45 54 PM

@GaetanLepage
Copy link
Contributor

@GaetanLepage Could you tell me how'd I retrieve the cargo hash? I thought it'll provide me if I try to build it. But yeah, I'm getting issue with nix-update-script not sure If it's intended.

For cargoHash, set it to an empty string (""), build it. The error message will contain the right hash.

For nix-update-script, you need to add it to the derivation inputs at the top of the file.

@pwnwriter
Copy link
Member Author

The upstream repo doesn't provide Cargo lock file. I think I should first make a pr there and then will make changes here?

@GaetanLepage
Copy link
Contributor

The upstream repo doesn't provide Cargo lock file. I think I should first make a pr there and then will make changes here?

Good point, I had not checked this.
So, switch back to vendoring the Cargo.lock in nixpkgs as you had done initially.
In the mean time, you could open an issue/PR upstream to ask them to track their Cargo.lock. No need to wait for them though.

@pwnwriter
Copy link
Member Author

The version has been bumped from 0.8.7 to 0.9.0. Should I discard this pr and create a new one as a follow up or this is fine as it is?

@GaetanLepage
Copy link
Contributor

The version has been bumped from 0.8.7 to 0.9.0. Should I discard this pr and create a new one as a follow up or this is fine as it is?

No, just force-push to this one. Update directly to 0.9.0.

@drupol drupol changed the title rwalk: init at 0.8.7 rwalk: init at 0.9.0 Dec 31, 2024
@pwnwriter
Copy link
Member Author

done

@GaetanLepage
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 366586


x86_64-linux

✅ 1 package built:
  • rwalk

aarch64-linux

✅ 1 package built:
  • rwalk

x86_64-darwin

✅ 1 package built:
  • rwalk

aarch64-darwin

✅ 1 package built:
  • rwalk

Copy link
Contributor

@GaetanLepage GaetanLepage left a comment

Choose a reason for hiding this comment

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

LGTM, well done @pwnwriter :)

@GaetanLepage GaetanLepage merged commit 838d953 into NixOS:master Dec 31, 2024
31 of 32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants