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 module: fix dataDir option #35343

Merged
merged 2 commits into from Feb 23, 2018
Merged

softether module: fix dataDir option #35343

merged 2 commits into from Feb 23, 2018

Conversation

ghost
Copy link

@ghost ghost commented Feb 22, 2018 •
edited by ghost

Motivation for this change

Closes #35339
cc @rick68

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
    • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

fpletz
fpletz approved these changes Feb 23, 2018
View reviewed changes
Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

So much nicer! Thanks!

@Mic92
Copy link
Member

Mic92 commented Feb 23, 2018

@GrahamcOfBorg build softether

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘softether-4.25’ in /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/servers/softether/4.25.nix:47 is not supported on ‘x86_64-darwin’, refusing to evaluate.

a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

The Makefile is generated. Run 'make' to build SoftEther VPN.
no configure script, doing nothing
building
installing
install flags: install
gcc -DNDEBUG -DVPN_SPEED -DUNIX -DUNIX_LINUX -DCPU_64 -D_REENTRANT -DREENTRANT -D_THREAD_SAFE -D_THREADSAFE -DTHREAD_SAFE -DTHREADSAFE -D_FILE_OFFSET_BITS=64 -I./src/ -I./src/Cedar/ -I./src/Mayaqua/ -O2 -fsigned-char -m64 -c src/Mayaqua/Cfg.c -o tmp/objs/Mayaqua/Cfg.o
gcc: error: unrecognized command line option '-m64'
make: *** [Makefile:74: tmp/objs/Mayaqua/Cfg.o] Error 1
builder for '/nix/store/smkwbpj91p4143gvg763dvn45n15sa0f-softether-4.25.drv' failed with exit code 2
�[31;1merror:�[0m build of '/nix/store/smkwbpj91p4143gvg763dvn45n15sa0f-softether-4.25.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

shrinking /nix/store/pl0dhyd5r8pnwm4zzvglcf8qj26l3x2d-softether-4.25/var/lib/softether/vpncmd/vpncmd
strip is /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/pl0dhyd5r8pnwm4zzvglcf8qj26l3x2d-softether-4.25/bin 
patching script interpreter paths in /nix/store/pl0dhyd5r8pnwm4zzvglcf8qj26l3x2d-softether-4.25
/nix/store/pl0dhyd5r8pnwm4zzvglcf8qj26l3x2d-softether-4.25/bin/vpnserver: interpreter directive changed from "/bin/sh" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh"
/nix/store/pl0dhyd5r8pnwm4zzvglcf8qj26l3x2d-softether-4.25/bin/vpnbridge: interpreter directive changed from "/bin/sh" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh"
/nix/store/pl0dhyd5r8pnwm4zzvglcf8qj26l3x2d-softether-4.25/bin/vpnclient: interpreter directive changed from "/bin/sh" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh"
/nix/store/pl0dhyd5r8pnwm4zzvglcf8qj26l3x2d-softether-4.25/bin/vpncmd: interpreter directive changed from "/bin/sh" to "/nix/store/zqh3l3lyw32q1ayb15bnvg9f24j5v2p0-bash-4.4-p12/bin/sh"
checking for references to /tmp/nix-build-softether-4.25.drv-0 in /nix/store/pl0dhyd5r8pnwm4zzvglcf8qj26l3x2d-softether-4.25...
/nix/store/pl0dhyd5r8pnwm4zzvglcf8qj26l3x2d-softether-4.25

@Mic92
Copy link
Member

Mic92 commented Feb 23, 2018

Softether uses a -m64, which is a x86-only option. Removing this could be an easy patch, but there might be other parts that do not work out of the box. I would disable aarch64 support in the latter case.

Mic92
Mic92 reviewed Feb 23, 2018
View reviewed changes
pkgs/servers/softether/4.18.nix
@@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
homepage = https://www.softether.org/;
license = licenses.gpl2;
maintainers = [ maintainers.rick68 ];
platforms = platforms.linux;
platforms = filter (p: p != "aarch64-linux") platforms.linux;
Copy link
Member

@Mic92 Mic92 Feb 23, 2018 •
edited

Choose a reason for hiding this comment

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

The compiler options restricts softether to exactly x86_64-linux. So just put platforms = ['x86_64-linux']; here.

Copy link
Member

Choose a reason for hiding this comment

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

I was not precise when I said disabling aarch64.

Copy link
Author

@ghost ghost Feb 23, 2018 •
edited by ghost

Choose a reason for hiding this comment

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

@Mic92 x86 is supported. They use very rudimentary configure script:
cp src/makefiles/${OS}_${CPU}.mak Makefile
that just picks suitable Makefile.

Copy link
Author

@ghost ghost Feb 23, 2018 •
edited by ghost

Choose a reason for hiding this comment

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

@Mic92 Thanks, aarch64 is disabled now, as I have no aarch64 machines to test. Also they don't support it officially yet: https://www.softether.org/4-docs/1-manual/5._SoftEther_VPN_Bridge_Manual/5.1_Operating_System_Requirements#5.1.2._Support_for_Linux

@Mic92 Mic92 merged commit df4963d into NixOS:master Feb 23, 2018
@ghost
Copy link
Author

ghost commented Feb 23, 2018

@fpletz @Mic92 Thanks!

@ghost ghost deleted the softether branch February 23, 2018 12:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos 8.has: clean-up 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Mic92 @GrahamcOfBorg @fpletz