Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ae1318043b89
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0cb8413b02ce
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 13, 2018

  1. Copy the full SHA
    ed6f176 View commit details
  2. Merge pull request #38885 from lopsided98/grafana-unix-socket

    grafana: support socket protocol
    Mic92 authored Apr 13, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    0cb8413 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/services/monitoring/grafana.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/monitoring/grafana.nix
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ in {
protocol = mkOption {
description = "Which protocol to listen.";
default = "http";
type = types.enum ["http" "https"];
type = types.enum ["http" "https" "socket"];
};

addr = mkOption {