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

v2raya: init at 2.0.0 #204807

Merged
merged 1 commit into from
Dec 11, 2022
Merged

v2raya: init at 2.0.0 #204807

merged 1 commit into from
Dec 11, 2022

Conversation

Eliot00
Copy link
Contributor

@Eliot00 Eliot00 commented Dec 6, 2022

Description of changes

Closes #158554

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation 8.has: module (update) This PR changes an existing module in `nixos/` labels Dec 6, 2022
@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 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 labels Dec 6, 2022
@Eliot00 Eliot00 force-pushed the v2raya-init branch 2 times, most recently from 90266fe to 77994c9 Compare December 8, 2022 01:56
nixos/modules/services/networking/v2raya.nix Show resolved Hide resolved
nixos/modules/services/networking/v2raya.nix Outdated Show resolved Hide resolved
pkgs/tools/networking/v2raya/default.nix Outdated Show resolved Hide resolved
@Eliot00 Eliot00 force-pushed the v2raya-init branch 2 times, most recently from bc88fac to 819d547 Compare December 8, 2022 07:23
@Eliot00 Eliot00 requested a review from zendo December 8, 2022 14:26
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild and removed 10.rebuild-darwin: 1 10.rebuild-darwin: 1-10 labels Dec 8, 2022
nixos/modules/services/networking/v2raya.nix Show resolved Hide resolved
pkgs/tools/networking/v2raya/default.nix Show resolved Hide resolved
nixos/modules/services/networking/v2raya.nix Outdated Show resolved Hide resolved
@NickCao
Copy link
Member

NickCao commented Dec 11, 2022

@Eliot00 Eliot00 force-pushed the v2raya-init branch 2 times, most recently from d600d28 to 50e9558 Compare December 11, 2022 14:10
@bobby285271 bobby285271 changed the title v2raya: init at unstable-2022-11-26 v2raya: init at 2.0.0 Dec 11, 2022
Update nixos/modules/services/networking/v2raya.nix

Co-authored-by: zendo <linzway@qq.com>

Update nixos/modules/services/networking/v2raya.nix

Co-authored-by: zendo <linzway@qq.com>

Update pkgs/tools/networking/v2raya/default.nix

Co-authored-by: zendo <linzway@qq.com>

Update pkgs/tools/networking/v2raya/default.nix

Co-authored-by: zendo <linzway@qq.com>

Update nixos/modules/services/networking/v2raya.nix

Co-authored-by: zendo <linzway@qq.com>

Update pkgs/tools/networking/v2raya/default.nix

Co-authored-by: zendo <linzway@qq.com>

Update nixos/modules/services/networking/v2raya.nix

Co-authored-by: zendo <linzway@qq.com>
dontFixup = true;
};
in
buildGoModule {
Copy link
Member

Choose a reason for hiding this comment

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

Some new lines wouldn't hurt to increase readability

Comment on lines +58 to +61
--prefix XDG_DATA_DIRS ":" ${symlinkJoin {
name = "assets";
paths = [ v2ray-geoip v2ray-domain-list-community ];
}}/share
Copy link
Member

Choose a reason for hiding this comment

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

Big inlines like this are not that readable, it should be done in a let in

};
};

config = mkIf config.services.v2raya.enable {
Copy link
Member

Choose a reason for hiding this comment

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

I doubt that this service has no options

unitConfig = {
Description = "v2rayA service";
Documentation = "https://github.com/v2rayA/v2rayA/wiki";
After = [ "network.target" "nss-lookup.target" "iptables.service" "ip6tables.service" ];
Copy link
Member

Choose a reason for hiding this comment

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

This will break if ipv6 is disabled.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 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.

5 participants