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: 0.7.0 -> 0.7.1 #354419

Merged
merged 1 commit into from
Nov 20, 2024
Merged

clash-rs: 0.7.0 -> 0.7.1 #354419

merged 1 commit into from
Nov 20, 2024

Conversation

aucub
Copy link
Contributor

@aucub aucub commented Nov 8, 2024

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.

@aucub aucub marked this pull request as ready for review November 8, 2024 07:14
@aucub aucub requested a review from zi3m5f November 8, 2024 07:15
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Nov 8, 2024
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 except:

Regarding the hash change for tuic-1.3.1, see Watfaq/clash-rs#635 (review)

A changing source hash without version update seems suspicious and we should always check why that happens.

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 354419


x86_64-linux

✅ 1 package built:
  • clash-rs

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

As tuic simply didn't update the version in their Cargo.toml: LGTM 👍

Unrelated:
Can't we use Cargo.lock from upstream?

  lockFile = "${src}/Cargo.lock";

@zi3m5f
Copy link
Contributor

zi3m5f commented Nov 8, 2024

Maybe I didn't spot it before but you committed as nanari instead of aucub?

And a nitpick: please don't rebase onto a newer master unless necessary. Luckily your changes are small, because reviewing your force-push with all the other changes is kinda hard ;)
Just git commit --amend or git rebase -i HEAD~1 will do.

@zi3m5f
Copy link
Contributor

zi3m5f commented Nov 8, 2024

Unrelated: Can't we use Cargo.lock from upstream?
I don't know nix well and ofborg-eval went wrong. Can we really lockFile = "${src}/Cargo.lock";?

Sorry, was just wondering (and not thinking). That's "import from derivation" which isn't allowed in nixpkgs but works locally 🤷‍♂️

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 8, 2024
@aucub aucub requested a review from Scrumplex November 19, 2024 17:50
@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 19, 2024
@Scrumplex
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 354419


x86_64-linux

✅ 1 package built:
  • clash-rs

@Scrumplex Scrumplex merged commit 2468db7 into NixOS:master Nov 20, 2024
27 of 28 checks passed
@Scrumplex Scrumplex added the backport release-24.11 Backport PR automatically label Nov 20, 2024
Copy link
Contributor

Successfully created backport PR for release-24.11:

Copy link
Contributor

Git push to origin failed for release-24.11 with exitcode 1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes backport release-24.11 Backport PR automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants