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

clash-rs: init at 0.7.0 #351974

Merged
merged 1 commit into from
Nov 1, 2024
Merged

clash-rs: init at 0.7.0 #351974

merged 1 commit into from
Nov 1, 2024

Conversation

aucub
Copy link
Contributor

@aucub aucub commented Oct 28, 2024

ClashRS, A custom protocol, rule based network proxy software. https://github.com/Watfaq/clash-rs

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/cl/clash-rs/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/cl/clash-rs/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/cl/clash-rs/package.nix Outdated Show resolved Hide resolved
@Aleksanaa
Copy link
Member

Aleksanaa commented Oct 29, 2024

Why are you targeting staging-next? (Instead of master) Is there something truly needed?

@aucub
Copy link
Contributor Author

aucub commented Oct 29, 2024

Why are you targeting staging-next? (Instead of master) Is there something truly needed?

There is no need, just wait for Rust 1.82 to reach the master branch. Maybe it should be set to draft now

Copy link
Contributor

@zi3m5f zi3m5f left a comment

Choose a reason for hiding this comment

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

LGTM 👍

  • builds as is
  • builds with versionCheckHook additions
  • builds with extra features, see below

I noticed -F "shadowsocks, tuic, onion" in the github ci workflow building the official binaries:
https://github.com/Watfaq/clash-rs/blob/98d183b04f96b8bcabe265af849713abeb5f40c3/.github/workflows/ci.yml#L48

Maybe add them to not differ from upstream?

  buildFeatures = [ "shadowsocks" "tuic" "onion" ];

seems to work:

cargoBuildHook flags: -j 12 --target x86_64-unknown-linux-gnu --offline --profile release --features=shadowsocks,tuic,onion

pkgs/by-name/cl/clash-rs/package.nix Show resolved Hide resolved
pkgs/by-name/cl/clash-rs/package.nix Show resolved Hide resolved
@aucub aucub force-pushed the clash-rs branch 6 times, most recently from ef61b97 to 7335f9c Compare October 29, 2024 21:31
@aucub aucub changed the base branch from staging-next to master October 31, 2024 07:26
@Aleksanaa Aleksanaa merged commit a31bd92 into NixOS:master Nov 1, 2024
33 of 34 checks passed
@aucub aucub deleted the clash-rs branch November 1, 2024 02:56
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.

4 participants