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: 72ed36027703
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 271d3f7a432f
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 26, 2017

  1. httpd: don't install suid executables into nix store

    @fpletz
    fpletz committed Jun 26, 2017

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    b8bfc8d View commit details

  2. prometheus service: globalConfig.labels is obsolete 

    Due to the version bump in e60c958.
    @fpletz
    fpletz committed Jun 26, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    271d3f7 View commit details
Showing with 1 addition and 9 deletions.
  1. +0 −9 nixos/modules/services/monitoring/prometheus/default.nix
  2. +1 −0 pkgs/servers/http/thttpd/default.nix
9 changes: 0 additions & 9 deletions nixos/modules/services/monitoring/prometheus/default.nix
View file
Original file line number Diff line number Diff line change
@@ -66,15 +66,6 @@ let
How frequently to evaluate rules by default.
'';
};

labels = mkOption {
type = types.attrsOf types.str;
default = {};
description = ''
The labels to add to any timeseries that this Prometheus instance
scrapes.
'';
};
};
};

1 change: 1 addition & 0 deletions pkgs/servers/http/thttpd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {

prePatch = ''
sed -i -e 's/getline/getlineX/' extras/htpasswd.c
sed -i -e 's/chmod 2755/chmod 755/' extras/Makefile.in
'';

preInstall = ''