public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #94354 from flokli/systemd-246

Browse Source 
systemd: 245.6 -> 246
This commit is contained in:
Florian Klink
2020-08-24 12:42:24 +02:00
committed by GitHub
parent 6d122d67fa 618e273861
commit 40d2968ebf
66 changed files with 287 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/monitoring/loki/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }:
{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }:
buildGoPackage rec {
version = "1.6.0";
@@ -25,7 +25,7 @@ buildGoPackage rec {
preFixup = stdenv.lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/promtail \
--prefix LD_LIBRARY_PATH : "${systemd.lib}/lib"
--prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib"
'';
meta = with stdenv.lib; {
pkgs/servers/monitoring/prometheus/postfix-exporter.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests
{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests
, systemd, withSystemdSupport ? true }:
with stdenv.lib;
@@ -44,7 +44,7 @@ buildGoPackage rec {
postInstall = optionalString withSystemdSupport ''
wrapProgram $out/bin/postfix_exporter \
--prefix LD_LIBRARY_PATH : "${systemd.lib}/lib"
--prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib"
'';
passthru.tests = { inherit (nixosTests.prometheus-exporters) postfix; };