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

Re-enable the Systemd remote support #102244

Merged
merged 2 commits into from Nov 2, 2020

Conversation

nlewo
Copy link
Member

@nlewo nlewo commented Oct 31, 2020

Motivation for this change

Since ae896e0, Systemd is no longer compiled with the http gateway because of an incompatibility between Systemd and libmicrohttpd. However, because of some updates, it is now building fine!

I also enable this feature is the systemd test to ensure the option services.journald.enableHttpGateway is working as excepted.

@flokli should i rebase these patches onto staging-20.09?
Note I didn't run the systemd tests yet since a lot of things need to be rebuilt:/

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.

nixos/tests/systemd.nix Show resolved Hide resolved
@flokli
Copy link
Contributor

flokli commented Nov 1, 2020

We should also first fix the default of withRemote in staging.

@flokli
Copy link
Contributor

flokli commented Nov 2, 2020

This should target release-20.09, not nixos-20.09.

It kinda backports the commtis from #102448 - even though it's not a real cherry-pick, but a logical backport, can we add the `(cherry picked from commit xxx) to the commit mesages, and align the commit messages themselves, to better cross-link this?

@nlewo nlewo force-pushed the fix-enablehttpgateway branch 2 times, most recently from 0eb74a9 to 111e7d6 Compare November 2, 2020 19:57
@nlewo nlewo changed the base branch from nixos-20.09 to release-20.09 November 2, 2020 19:58
@nlewo
Copy link
Member Author

nlewo commented Nov 2, 2020

@flokli ok, i rewrote the history and based the branch onto release-20.09.

Note the test is still building on my laptop...

@flokli flokli changed the base branch from release-20.09 to staging-20.09 November 2, 2020 22:01
@flokli
Copy link
Contributor

flokli commented Nov 2, 2020

Updated this to target staging-20.09.

@flokli
Copy link
Contributor

flokli commented Nov 2, 2020

Had to fix some indentation on the test, otherwise succeeded 👍

@flokli flokli merged commit b40ed80 into NixOS:staging-20.09 Nov 2, 2020
@nlewo
Copy link
Member Author

nlewo commented Nov 3, 2020

@flokli Cool, thank you!

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

2 participants