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

lighttpd: Unbreak on darwin, enable tests #53488

Merged
merged 3 commits into from Jan 6, 2019

Conversation

kirelagin
Copy link
Member

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

* It is disabled by default in lighttpd itself
* Darwin doesn’t seem to have a function in libuiid that it needs
* Unbreak darwin
* It was unused anyway, as it is disabled by default
* Now there is an feature-argument to enable it
They seem to pass now, so why not.
@kirelagin
Copy link
Member Author

(FTR, I am not sure why the tests were disabled, I have no issues with them. Maybe they were fixed in a new release, or maybe they will still fail on Linux.)

@jagajaga jagajaga merged commit 5489e49 into NixOS:master Jan 6, 2019
@7c6f434c
Copy link
Member

7c6f434c commented Jan 9, 2019

Indeed they do: https://nix-cache.s3.amazonaws.com/log/pxwl8pny1g2fyqipcyqrqr8v1fa2r5jd-lighttpd-1.4.52.drv

I have a feeling that weak sandboxing on Darwin helps them pass.

7c6f434c added a commit to 7c6f434c/nixpkgs that referenced this pull request Jan 11, 2019
The tests were enabled in NixOS#53488 and succeeded on Darwin; on Linux they
still failed because of empty hostname inside the sandbox (we have no
UTS-namespace hostname and I think no /etc/hosts). Nix on Darwin lacks
powerful enough sandboxing, so there were no problems on Darwin.

Patching the tests to fallback to "127.0.0.1" if hostname of the
localhost cannot be retrieved matches the behaviour of lighttpd itself
and allows the tests to pass.

Not sure if having no hostname in the test environment is a bit too
weird for the upstream to care.
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.

None yet

5 participants