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/journaldriver: import module in top-level module list #50393

Merged
merged 1 commit into from Nov 15, 2018
Merged

nixos/journaldriver: import module in top-level module list #50393

merged 1 commit into from Nov 15, 2018

Conversation

tazjin
Copy link
Member

@tazjin tazjin commented Nov 15, 2018

Imports the journaldriver module into the top-level NixOS module
list to make it usable without extra work.

This went unnoticed in #42134 (mostly because my setup imports modules
explicitly from pinned versions).

Fixes #50390

Note: This should probably be backported to 18.09 because the module is included there, but not imported.

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)
  • Fits CONTRIBUTING.md.

@tazjin
nixos/journaldriver: import module in top-level module list
d5ea097 
Imports the `journaldriver` module into the top-level NixOS module
list to make it usable without extra work.

This went unnoticed in NixOS#42134 (mostly because my setup imports modules
explicitly from pinned versions).

Fixes NixOS#50390
@tazjin tazjin force-pushed the fix/journaldriver-module-import branch from 4590e4d to d5ea097 Compare November 15, 2018 10:03
@infinisil infinisil merged commit 428eef6 into NixOS:master Nov 15, 2018
@tazjin tazjin deleted the fix/journaldriver-module-import branch November 15, 2018 11:52
@tazjin
Copy link
Member Author

tazjin commented Dec 10, 2018

@infinisil Hey, is it possible to get this backported to 18.09?

@Mic92
Copy link
Member

Mic92 commented Dec 27, 2018

[detached HEAD 5c48901] nixos/journaldriver: import module in top-level module list
Author: Vincent Ambo mail@tazj.in
Date: Thu Nov 15 10:57:22 2018 +0100
1 file changed, 1 insertion(+)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil Awaiting requested review from infinisil

Assignees
No one assigned
Labels
6.topic: nixos 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
4 participants
@tazjin @Mic92 @infinisil @GrahamcOfBorg