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

nixos/captive-browser: fix module #63135

Merged
merged 1 commit into from
Jun 15, 2019
Merged

nixos/captive-browser: fix module #63135

merged 1 commit into from
Jun 15, 2019
+17 −3

Conversation

Ma27
Copy link
Member

@Ma27 Ma27 commented Jun 14, 2019 •
edited
Loading

Motivation for this change

Fixes the broken metrics evaluation which was caused by a trace
warning in stdout which confused jq in pkgs/top-level/metrics.nix.

Also made the bind-device feature optional as suggested after the
merge.

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 nix-review --run "nix-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.

Sorry, something went wrong.

@Ma27
nixos/captive-browser: fix module
d9f7bac 
Fixes the broken metrics evaluation which was caused by a `trace`
warning in stdout which confused `jq` in `pkgs/top-level/metrics.nix`.

Also made the `bind-device` feature optional as suggested after the
merge.
@Ma27 Ma27 force-pushed the captive-browser-regression branch from f522de9 to d9f7bac Compare June 14, 2019 19:06
@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Jun 14, 2019
@samueldr
Copy link
Member

Thumb-up by author of previous PR seems good to me.

@samueldr samueldr merged commit 8c14a6f into NixOS:master Jun 15, 2019
@Ma27 Ma27 deleted the captive-browser-regression branch June 15, 2019 09:37
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 Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Ma27 @samueldr