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.

Sign up for GitHub

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

softether: 4.18 -> 4.20 #29781

Merged
merged 1 commit into from Oct 5, 2017
Merged

softether: 4.18 -> 4.20 #29781

merged 1 commit into from Oct 5, 2017

Conversation

rick68
Copy link
Contributor

@rick68 rick68 commented Sep 25, 2017 •
edited

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@rick68, thanks for your PR! By analyzing the history of the files in this pull request, we identified @groxxda to be a potential reviewer.

NeQuissimus
NeQuissimus reviewed Sep 26, 2017
View reviewed changes
pkgs/top-level/all-packages.nix
@@ -11638,7 +11638,8 @@ with pkgs;
oracleXE = callPackage ../servers/sql/oracle-xe { };

softether_4_18 = callPackage ../servers/softether/4.18.nix { };
Copy link
Member

Choose a reason for hiding this comment

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

Do we need to keep 4.18 around?

Copy link
Contributor Author

@rick68 rick68 Sep 27, 2017 •
edited

Choose a reason for hiding this comment

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

I add services.softether.package option for this, we could use this version when we got something wrong in new version.

@orivej
Copy link
Contributor

orivej commented Oct 1, 2017

Why don't you update to 4.22?

@rick68
Copy link
Contributor Author

rick68 commented Oct 2, 2017

@orivej the 4.22 version is beta, I am not sure that version is stable or not.

orivej
orivej reviewed Oct 2, 2017
View reviewed changes
Copy link
Contributor

@orivej orivej left a comment

Choose a reason for hiding this comment

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

Indeed, this page says that 4.22 is beta and 4.20 is a release: http://www.softether.org/5-download/history

nixos/modules/services/networking/softether.nix Outdated
wantedBy = [ "multi-user.target" ];
after = [ "softether-init.service" ];
requires = [ "softether-init.service" ];
wantedBy = [ "network-interfaces.target" ];
Copy link
Contributor

Choose a reason for hiding this comment

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

Replace network-interfaces.target with network.target: #18491
Please confirm that it works as you expect afterwards.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@orivej Oops, thank you for reviewed that, I have replaced.

@orivej orivej merged commit 184f80a into NixOS:master Oct 5, 2017
@infinisil infinisil mentioned this pull request Nov 16, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@orivej orivej orivej left review comments

@NeQuissimus NeQuissimus NeQuissimus left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@rick68 @mention-bot @orivej @NeQuissimus