-
-
Notifications
You must be signed in to change notification settings - Fork 14.4k
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
mirakurun: init at 3.3.0 #48740
mirakurun: init at 3.3.0 #48740
Conversation
ad88cde
to
1462967
Compare
a333228
to
fe990ad
Compare
29548a7
to
e1f0121
Compare
e1f0121
to
37ea792
Compare
37ea792
to
d2afac3
Compare
d2afac3
to
80921a8
Compare
80921a8
to
4ed36f4
Compare
8f8284a
to
f414278
Compare
f414278
to
94f50c2
Compare
I rebased and ran |
Looks like |
94f50c2
to
d63db89
Compare
Rebased again to pull in |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Haven't had the motivation for full module reviews recently, I hope you don't mind this being a bit late!
No worries, your reviews are helpful and I've learned quite a lot :-) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looking good! Can you squash the commits into at least one for the package and one for the module?
4572c3e
to
741d29e
Compare
I'm going to put the braces back on where Lines 266 to 270 in d4bbe9a
Here's the error message from the module:
|
741d29e
to
8fac068
Compare
Done diff --git a/nixos/modules/services/video/mirakurun.nix b/nixos/modules/services/video/mirakurun.nix
index e878802db7c..ec45bd84184 100644
--- a/nixos/modules/services/video/mirakurun.nix
+++ b/nixos/modules/services/video/mirakurun.nix
@@ -145,8 +145,8 @@ in
getconf = target: config.environment.etc."mirakurun/${target}.yml".source;
targets = [
"server"
- ] ++ optionals (cfg.tunerSettings != null) "tuners"
- ++ optionals (cfg.channelSettings != null) "channels";
+ ] ++ optionals (cfg.tunerSettings != null) [ "tuners" ]
+ ++ optionals (cfg.channelSettings != null) [ "channels" ];
in (map getconf targets);
};
}; |
8fac068
to
3c951a6
Compare
Thanks! Would you also mind to take a look at #49413? |
Motivation for this change
Mirakurun is a backend for DVR software that manages ISDB-compatible tuners.
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)nix path-info -S
before and after)