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

Jump to bottom

nixos/shadowsocks: add test without plugin #97478

Merged
merged 2 commits into from Sep 14, 2020
Merged

nixos/shadowsocks: add test without plugin #97478

merged 2 commits into from Sep 14, 2020

Conversation

hmenke
Copy link
Member

@hmenke hmenke commented Sep 8, 2020 •
edited

Motivation for this change

Fixes #96127 (comment)

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@hmenke hmenke changed the title Shadowsocks nixos/shadowsocks: add test without plugin Sep 8, 2020
@hmenke hmenke mentioned this pull request Sep 8, 2020
Merged
10 tasks
hmenke
hmenke commented Sep 8, 2020
View reviewed changes
nixos/modules/services/networking/shadowsocks.nix
@@ -129,7 +147,7 @@ in
description = "shadowsocks-libev Daemon";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
path = [ pkgs.shadowsocks-libev cfg.plugin ] ++ optional (cfg.passwordFile != null) pkgs.jq;
path = [ pkgs.shadowsocks-libev ] ++ optional (cfg.plugin != null) cfg.plugin ++ optional (cfg.passwordFile != null) pkgs.jq;
Copy link
Member Author

Choose a reason for hiding this comment

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

This should fix #96127 (comment)

Copy link
Contributor

Choose a reason for hiding this comment

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

LGTM 👍

@hmenke
Copy link
Member Author

hmenke commented Sep 8, 2020

Result of nixpkgs-review pr 97478 1

@hmenke
Copy link
Member Author

hmenke commented Sep 9, 2020

@ofborg test shadowsocks.shadowsocks shadowsocks.shadowsocks-v2ray-plugin

@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/298

@hmenke
Copy link
Member Author

hmenke commented Sep 10, 2020

@ofborg test shadowsocks.basic shadowsocks.v2ray-plugin

@bennofs bennofs merged commit 9d60354 into NixOS:master Sep 14, 2020
@hmenke
Copy link
Member Author

hmenke commented Sep 14, 2020

@bennofs I see you backported it to 20.09 as well already. Thank you very much!

@hmenke hmenke deleted the shadowsocks branch September 14, 2020 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mrmaxmeier Mrmaxmeier Mrmaxmeier left review comments

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@hmenke @nixos-discourse @Mrmaxmeier @bennofs