Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 78763398c3ea
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 95f1a9a03439
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on Oct 25, 2019

  1. grafana-loki: 0.3.0 -> 0.4.0

    @WilliButz
    WilliButz committed Oct 25, 2019
    Copy the full SHA
    3236de7 View commit details

  2. Merge pull request #71998 from WilliButz/update-loki 

    grafana-loki: 0.3.0 -> 0.4.0
    @Ma27
    Ma27 authored Oct 25, 2019
    Copy the full SHA
    f5c3d6b View commit details

  3. nixos/i18n: use str instead of string for consoleKeyMap

    @WilliButz
    WilliButz committed Oct 25, 2019
    Copy the full SHA
    509fadd View commit details

  4. Merge pull request #71999 from WilliButz/fix-i18n 

    nixos/i18n: use str instead of string for consoleKeyMap
    @WilliButz
    WilliButz authored Oct 25, 2019
    Copy the full SHA
    95f1a9a View commit details
Showing with 3 additions and 7 deletions.
  1. +1 −5 nixos/modules/config/i18n.nix
  2. +2 −2 pkgs/servers/monitoring/loki/default.nix
6 changes: 1 addition & 5 deletions nixos/modules/config/i18n.nix
View file
Original file line number Diff line number Diff line change
@@ -89,11 +89,7 @@ with lib;
};

consoleKeyMap = mkOption {
type = mkOptionType {
name = "string or path";
check = t: (isString t || types.path.check t);
};

type = with types; either str path;
default = "us";
example = "fr";
description = ''
4 changes: 2 additions & 2 deletions pkgs/servers/monitoring/loki/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }:

buildGoPackage rec {
version = "0.3.0";
version = "0.4.0";
pname = "grafana-loki";
goPackagePath = "github.com/grafana/loki";

@@ -11,7 +11,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "loki";
sha256 = "1b61fqk6ah4qps4nq7ypdax4i7pkhjxdw4qrhc1zvzzhxr7x13rs";
sha256 = "1anwq5dbh29dma18hnialbb253ciazzxmnqvympbh29ricldcf8p";
};

nativeBuildInputs = [ makeWrapper ];