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

Commits on Apr 16, 2020

  1. netdata: 1.21.0 -> 1.21.1 

    Changelog: https://github.com/netdata/netdata/releases/tag/v1.21.1
    @marsam
    marsam authored and Jon committed Apr 16, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    yorickvP Yorick
    GPG key ID: A36E70F9DC014A15
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7ff456d View commit details

  2. netdata-go.d.plugin: 0.15.0 -> 0.18.0

    @marsam
    marsam authored and Jon committed Apr 16, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    yorickvP Yorick
    GPG key ID: A36E70F9DC014A15
    Verified
    Learn about vigilant mode
    Copy the full SHA
    95e007d View commit details
Showing with 13 additions and 548 deletions.
  1. +4 −4 pkgs/tools/system/netdata/default.nix
  2. +0 −534 pkgs/tools/system/netdata/deps.nix
  3. +9 −10 pkgs/tools/system/netdata/go.d.plugin.nix
8 changes: 4 additions & 4 deletions pkgs/tools/system/netdata/default.nix
View file
Original file line number Diff line number Diff line change
@@ -14,14 +14,14 @@ with stdenv.lib;
let
go-d-plugin = callPackage ./go.d.plugin.nix {};
in stdenv.mkDerivation rec {
version = "1.21.0";
version = "1.21.1";
pname = "netdata";

src = fetchFromGitHub {
owner = "netdata";
repo = "netdata";
rev = "v${version}";
sha256 = "08gxwxvg816hj7sxsb8s97ny2562xri9nx0w2zx7xsssp22grawk";
sha256 = "0i0k64r8j1g02s2bi2gm0j47y52l3xli63w686ncpgmlhwmdfz65";
};

nativeBuildInputs = [ autoreconfHook pkgconfig ];
@@ -41,8 +41,8 @@ in stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";

postInstall = ''
ln -s ${go-d-plugin.bin}/lib/netdata/conf.d/* $out/lib/netdata/conf.d
ln -s ${go-d-plugin.bin}/bin/godplugin $out/libexec/netdata/plugins.d/go.d.plugin
ln -s ${go-d-plugin}/lib/netdata/conf.d/* $out/lib/netdata/conf.d
ln -s ${go-d-plugin}/bin/godplugin $out/libexec/netdata/plugins.d/go.d.plugin
'' + optionalString (!stdenv.isDarwin) ''
# rename this plugin so netdata will look for setuid wrapper
mv $out/libexec/netdata/plugins.d/apps.plugin \
Loading