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: b4ede959ddd6
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: 3524ba8e8b17
Choose a head ref
  • 5 commits
  • 4 files changed
  • 3 contributors

Commits on Nov 26, 2019

  1. update.nix: fix eval 

    (cherry picked from commit e716e86)
    @worldofpeace @talyz
    worldofpeace authored and talyz committed Nov 26, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    776b456 View commit details

  2. common-updater-scripts: Fix breakage 

    Fixes a bug introduced by 9b090cc
where the script fails to run if $attr.${versionKey} exists.

(cherry picked from commit 809768b)
    @talyz
    talyz committed Nov 26, 2019
    Copy the full SHA
    cc8bd61 View commit details

  3. Merge pull request #74269 from talyz/backport-getname-fixes 

    [19.09] Backport lib.getName fixes
    @worldofpeace
    worldofpeace authored Nov 26, 2019
    Copy the full SHA
    e056ef3 View commit details

  4. grafana: 6.4.4 -> 6.4.5 

    (cherry picked from commit 12c1f4b)
    @WilliButz
    WilliButz committed Nov 26, 2019
    Copy the full SHA
    e3eaf19 View commit details

  5. nixos/prometheus-exporters: fix nginx exporter startup 

    When nginx is enabled on the same host the nginx exporter is,
the exporter needs to start after nginx.

(cherry picked from commit adc5ae7)
    @WilliButz
    WilliButz committed Nov 26, 2019
    Copy the full SHA
    3524ba8 View commit details
2 changes: 1 addition & 1 deletion maintainers/scripts/update.nix
View file
Original file line number Diff line number Diff line change
@@ -126,7 +126,7 @@ let

packageData = package: {
name = package.name;
pname = lib.getName package;
pname = pkgs.lib.getName package;
updateScript = map builtins.toString (pkgs.lib.toList package.updateScript);
};

3 changes: 3 additions & 0 deletions nixos/modules/services/monitoring/prometheus/exporters.nix
View file
Original file line number Diff line number Diff line change
@@ -196,6 +196,9 @@ in
services.prometheus.exporters.minio.minioAccessSecret = mkDefault config.services.minio.secretKey;
})] ++ [(mkIf config.services.rspamd.enable {
services.prometheus.exporters.rspamd.url = mkDefault "http://localhost:11334/stat";
})] ++ [(mkIf config.services.nginx.enable {
systemd.services.prometheus-nginx-exporter.after = [ "nginx.service" ];
systemd.services.prometheus-nginx-exporter.requires = [ "nginx.service" ];
})] ++ (mapAttrsToList (name: conf:
mkExporterConf {
inherit name;
2 changes: 1 addition & 1 deletion pkgs/common-updater/scripts/update-source-version
View file
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@ if [ -z "$oldUrl" ]; then
fi

drvName=$(nix-instantiate $systemArg --eval -E "with import ./. {}; lib.getName $attr" | tr -d '"')
oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or lib.getVersion $attr" | tr -d '"')
oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (lib.getVersion $attr)" | tr -d '"')

if [ -z "$drvName" -o -z "$oldVersion" ]; then
die "Couldn't evaluate name and version from '$attr.name'!"
6 changes: 3 additions & 3 deletions pkgs/servers/monitoring/grafana/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

buildGoPackage rec {
pname = "grafana";
version = "6.4.4";
version = "6.4.5";

goPackagePath = "github.com/grafana/grafana";

@@ -12,12 +12,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "0v5iwny96kb07qkj2qqqfgvnsw3dfcq3wf66zsllqavnahvrd1s8";
sha256 = "0chfskz3j0jc25fj7zpbs46lp6a426gz6nigiana04sqylmxm851";
};

srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "15583cdi4yajg678d3kj8nngs9lwj0qqn2nh5zm8il9p71w57x0k";
sha256 = "0sfs8kv4sxacly39ddy05i3gv14i7d14fc1fb952kdx0zzm8zray";
};

postPatch = ''