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-verge-rev: 1.7.5 -> 1.7.7; clash-verge-rev: build from source; clash-verge-rev: add bot-wxt1221 as maintainers; #335998

Merged
merged 1 commit into from
Sep 9, 2024

Conversation

Bot-wxt1221
Copy link
Member

@Bot-wxt1221 Bot-wxt1221 commented Aug 20, 2024

Description of changes

Just build from source.

#324541 #318525 are doing the same thing but they haven't got any activities.

Anyway, It is already tested by me.

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.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/4437

@Bot-wxt1221 Bot-wxt1221 changed the title clash-verge-rev: 1.7.5 -> 1.7.6; clash-verge-rev: build from source; clash-verge-rev: add bot-wxt1221 as maintainers; geoip-loyalsoldier: init at 202408150459 clash-verge-rev: 1.7.5 -> 1.7.6; clash-verge-rev: build from source; clash-verge-rev: add bot-wxt1221 as maintainers; Aug 20, 2024
@Bot-wxt1221 Bot-wxt1221 force-pushed the clash-verge-build-from-source branch 2 times, most recently from 1ce9719 to 25a095a Compare August 20, 2024 07:06
@Bot-wxt1221 Bot-wxt1221 added the backport release-24.05 Backport PR automatically label Aug 20, 2024
@Bot-wxt1221
Copy link
Member Author

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

1 package built:
  • clash-verge-rev

pkgs/by-name/cl/clash-verge-rev/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/cl/clash-verge-rev/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/cl/clash-verge-rev/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/cl/clash-verge-rev/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/cl/clash-verge-rev/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/cl/clash-verge-rev/package.nix Show resolved Hide resolved
pkgs/by-name/cl/clash-verge-rev/package.nix Show resolved Hide resolved
pkgs/by-name/cl/clash-verge-rev/package.nix Show resolved Hide resolved
pkgs/by-name/cl/clash-verge-rev/package.nix Outdated Show resolved Hide resolved
pkgs/by-name/cl/clash-verge-rev/package.nix Show resolved Hide resolved
@Bot-wxt1221
Copy link
Member Author

@SuperSandro2000 Done.

@Bot-wxt1221
Copy link
Member Author

@linsui Done

@Bot-wxt1221 Bot-wxt1221 force-pushed the clash-verge-build-from-source branch 2 times, most recently from 36cff50 to 557c780 Compare August 23, 2024 03:38
@Bot-wxt1221
Copy link
Member Author

Bot-wxt1221 commented Aug 24, 2024

@linsui Done. By the way, do you know any way to prefetch pnpmDeps hash?

@linsui
Copy link
Contributor

linsui commented Aug 24, 2024

Please add empty lines between blocks.
There are some unused args. Please remove them. You can use an LSP to help you find them.
1.7.7 has been available, please update.

@linsui
Copy link
Contributor

linsui commented Aug 25, 2024

We can use linkFarm:

linkFarm pname {
  "bin/clash-verge-service" = "${service}/bin/clash-verge-service";
  "bin/clash-verge" = "${unwrapped}/bin/clash-verge";
  "bin/verge-mihomo" = "${mihomo}/bin/mihomo";
  "lib/clash-verge/resources/geoip.dat" = "${v2ray-geoip}/share/v2ray/geoip.dat";
  "lib/clash-verge/resources/geosite.dat" = "${v2ray-domain-list-community}/share/v2ray/geosite.dat";
  "lib/clash-verge/resources/Country.mmdb" = dbip-country-lite.mmdb;
  share = "${unwrapped}/share";
}

@Bot-wxt1221
Copy link
Member Author

@linsui linkFarm can't be. clash-verge shouldn't be symbol linked because it find mihomo in it's runtime directory.

@Bot-wxt1221
Copy link
Member Author

@Aleksanaa Done

…clash-verge-rev: add bot-wxt1221 as maintainers
@Bot-wxt1221
Copy link
Member Author

@Aleksanaa Ready for review again.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/4504


runHook postInstall
'';
}
Copy link
Member

Choose a reason for hiding this comment

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

meta is missing

Copy link
Member Author

Choose a reason for hiding this comment

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

Why need meta? It is only for building clash-verge-rev itself not for user.

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

every package should have meta even if it is internal. It is used by hydra to know where to build the package and documents licenses. Please send a follow up PR to add meta.

pkgs/by-name/cl/clash-verge-rev/unwrapped.nix Show resolved Hide resolved
pkgs/by-name/cl/clash-verge-rev/service.nix Show resolved Hide resolved
@Bot-wxt1221
Copy link
Member Author

Bot-wxt1221 commented Sep 4, 2024

@SuperSandro2000 Why need meta? They will only be used here and make the main package rebuild.

@Bot-wxt1221
Copy link
Member Author

@linsui @Aleksanaa Could you please review again?

@Aleksanaa Aleksanaa merged commit de10e71 into NixOS:master Sep 9, 2024
26 checks passed
Copy link
Contributor

github-actions bot commented Sep 9, 2024

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-335998-to-release-24.05 origin/release-24.05
cd .worktree/backport-335998-to-release-24.05
git switch --create backport-335998-to-release-24.05
git cherry-pick -x 766b1bc091deead980c5334e3fbf87b59e71ad07

@Bot-wxt1221
Copy link
Member Author

Bot-wxt1221 commented Sep 9, 2024

Oh no. We shouldn't backport it. I forget it.

@Hobr
Copy link

Hobr commented Sep 12, 2024

programs.clash-verge.autoStart = true;

cp: cannot stat '/nix/store/an7azv5n3cldavi61i96ffpiysa56463-clash-verge-rev-1.7.7/share/applications/clash-verge.desktop': No such file or directory

@Bot-wxt1221
Copy link
Member Author

Bot-wxt1221 commented Sep 12, 2024

@Hobr Oh no. Another PR is required.

Upd:#341297

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.

6 participants