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: 87d598e310ce
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1bf1ae396627
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 12, 2020

  1. prometheus: use runCommandNoCCLocal for config gen

    @globin
    globin committed Apr 12, 2020
    Copy the full SHA
    0e040d1 View commit details

Commits on Apr 13, 2020

  1. Merge pull request #85092 from mayflower/prometheus-local-config-gen 

    prometheus: use runCommandNoCCLocal for config gen
    @Ma27
    Ma27 authored Apr 13, 2020
    Copy the full SHA
    1bf1ae3 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 nixos/modules/services/monitoring/prometheus/default.nix
4 changes: 2 additions & 2 deletions nixos/modules/services/monitoring/prometheus/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ let
# a wrapper that verifies that the configuration is valid
promtoolCheck = what: name: file:
if cfg.checkConfig then
pkgs.runCommand
pkgs.runCommandNoCCLocal
"${name}-${replaceStrings [" "] [""] what}-checked"
{ buildInputs = [ cfg.package ]; } ''
ln -s ${file} $out
@@ -19,7 +19,7 @@ let

# Pretty-print JSON to a file
writePrettyJSON = name: x:
pkgs.runCommand name { preferLocalBuild = true; } ''
pkgs.runCommandNoCCLocal name {} ''
echo '${builtins.toJSON x}' | ${pkgs.jq}/bin/jq . > $out
'';