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

pkgs/servers: stdenv.lib -> lib

Browse Source
This commit is contained in:
Ben Siraphob
2021-01-15 14:24:03 +07:00
parent e245ae3c3a
commit 872973d7d1
172 changed files with 454 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/monitoring/fusion-inventory/default.nix
+1 -1
View File
@@ -76,7 +76,7 @@ perlPackages.buildPerlPackage rec {
meta = with lib; {
homepage = "http://www.fusioninventory.org";
description = "FusionInventory unified Agent for UNIX, Linux, Windows and MacOSX";
license = stdenv.lib.licenses.gpl2;
license = lib.licenses.gpl2;
maintainers = [ maintainers.phile314 ];
};
}
pkgs/servers/monitoring/grafana-reporter/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ stdenv, buildGoPackage, fetchFromGitHub, tetex, makeWrapper }:
{ lib, stdenv, buildGoPackage, fetchFromGitHub, tetex, makeWrapper }:
with stdenv.lib;
with lib;
buildGoPackage rec {
pname = "reporter";
pkgs/servers/monitoring/lcdproc/default.nix
+1 -1
View File
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
postFixup = ''
for f in $out/bin/*.pl ; do
substituteInPlace $f \
--replace /usr/bin/perl ${stdenv.lib.getBin perl}/bin/perl
--replace /usr/bin/perl ${lib.getBin perl}/bin/perl
done
# NixOS will not use this file anyway but at least we can now execute LCDd
pkgs/servers/monitoring/loki/default.nix
+2 -2
View File
@@ -17,9 +17,9 @@ buildGoModule rec {
subPackages = [ "..." ];
nativeBuildInputs = [ makeWrapper ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd.dev ];
buildInputs = lib.optionals stdenv.isLinux [ systemd.dev ];
preFixup = stdenv.lib.optionalString stdenv.isLinux ''
preFixup = lib.optionalString stdenv.isLinux ''
wrapProgram $out/bin/promtail \
--prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib"
'';
pkgs/servers/monitoring/nagios/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, php, gd, libpng, zlib, unzip, nixosTests }:
{ lib, stdenv, fetchurl, perl, php, gd, libpng, zlib, unzip, nixosTests }:
stdenv.mkDerivation rec {
pname = "nagios";
@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
meta = {
description = "A host, service and network monitoring program";
homepage = "https://www.nagios.org/";
license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.linux;
maintainers = with stdenv.lib.maintainers; [ immae thoughtpolice relrod ];
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ immae thoughtpolice relrod ];
};
}
pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
+1 -1
View File
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
postInstall = ''
wrapProgram $out/bin/check_ssl_cert \
--prefix PATH : "${stdenv.lib.makeBinPath [ openssl file which curl ]}"
--prefix PATH : "${lib.makeBinPath [ openssl file which curl ]}"
'';
meta = with lib; {
pkgs/servers/monitoring/net-snmp/default.nix
+1 -1
View File
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
"--with-openssl=${openssl.dev}"
"--disable-embedded-perl"
"--without-perl-modules"
] ++ stdenv.lib.optional stdenv.isLinux "--with-mnttab=/proc/mounts";
] ++ lib.optional stdenv.isLinux "--with-mnttab=/proc/mounts";
postPatch = ''
substituteInPlace testing/fulltests/support/simple_TESTCONF.sh --replace "/bin/netstat" "${nettools}/bin/netstat"
pkgs/servers/monitoring/plugins/default.nix
+2 -2
View File
@@ -1,9 +1,9 @@
{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, runCommand
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, runCommand
, coreutils, gnugrep, gnused, lm_sensors, net-snmp, openssh, openssl, perl
, dnsutils, libdbi, libmysqlclient, zlib, openldap, procps
, runtimeShell }:
with stdenv.lib;
with lib;
let
majorVersion = "2.2";
pkgs/servers/monitoring/plugins/esxi.nix
+1 -1
View File
@@ -4,7 +4,7 @@ let
bName = "check_esxi_hardware";
in python3Packages.buildPythonApplication rec {
pname = stdenv.lib.replaceStrings [ "_" ] [ "-" ] bName;
pname = lib.replaceStrings [ "_" ] [ "-" ] bName;
version = "20200710";
src = fetchFromGitHub {
pkgs/servers/monitoring/plugins/labs_consol_de.nix
+1 -1
View File
@@ -22,7 +22,7 @@ let
nativeBuildInputs = [ autoreconfHook makeWrapper ];
prePatch = with stdenv.lib; ''
prePatch = with lib; ''
rm -rf GLPlugin
ln -s ${glplugin} GLPlugin
substituteInPlace plugins-scripts/Makefile.am \
pkgs/servers/monitoring/prometheus/alertmanager.nix
+1 -1
View File
@@ -21,7 +21,7 @@ buildGoPackage rec {
-X ${t}.Branch=unknown
-X ${t}.BuildUser=nix@nixpkgs
-X ${t}.BuildDate=unknown
-X ${t}.GoVersion=${stdenv.lib.getVersion go}
-X ${t}.GoVersion=${lib.getVersion go}
'';
nativeBuildInputs = [ installShellFiles ];
pkgs/servers/monitoring/prometheus/bind-exporter.nix
+1 -1
View File
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "bind_exporter";
version = "20161221-${stdenv.lib.strings.substring 0 7 rev}";
version = "20161221-${lib.strings.substring 0 7 rev}";
rev = "4e1717c7cd5f31c47d0c37274464cbaabdd462ba";
goPackagePath = "github.com/digitalocean/bind_exporter";
pkgs/servers/monitoring/prometheus/postfix-exporter.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests
, systemd, withSystemdSupport ? true }:
with stdenv.lib;
with lib;
buildGoPackage rec {
pname = "postfix_exporter";
pkgs/servers/monitoring/prometheus/pushgateway.nix
+1 -1
View File
@@ -24,7 +24,7 @@ buildGoPackage rec {
-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Branch=${rev}
-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildUser=${buildUser}
-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildDate=${buildDate}
-X main.goVersion=${stdenv.lib.getVersion go}
-X main.goVersion=${lib.getVersion go}
'';
doInstallCheck = true;
pkgs/servers/monitoring/zabbix/agent.nix
+1 -1
View File
@@ -6,7 +6,7 @@ import ./versions.nix ({ version, sha256 }:
inherit version;
src = fetchurl {
url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz";
url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz";
inherit sha256;
};
pkgs/servers/monitoring/zabbix/proxy.nix
+2 -2
View File
@@ -13,7 +13,7 @@ assert postgresqlSupport -> !mysqlSupport && !sqliteSupport;
assert sqliteSupport -> !mysqlSupport && !postgresqlSupport;
let
inherit (stdenv.lib) optional optionalString;
inherit (lib) optional optionalString;
in
import ./versions.nix ({ version, sha256 }:
stdenv.mkDerivation {
@@ -21,7 +21,7 @@ in
inherit version;
src = fetchurl {
url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz";
url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz";
inherit sha256;
};
pkgs/servers/monitoring/zabbix/server.nix
+2 -2
View File
@@ -13,7 +13,7 @@ assert mysqlSupport -> !postgresqlSupport;
assert postgresqlSupport -> !mysqlSupport;
let
inherit (stdenv.lib) optional optionalString;
inherit (lib) optional optionalString;
in
import ./versions.nix ({ version, sha256 }:
stdenv.mkDerivation {
@@ -21,7 +21,7 @@ in
inherit version;
src = fetchurl {
url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz";
url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz";
inherit sha256;
};
pkgs/servers/monitoring/zabbix/web.nix
+2 -2
View File
@@ -6,7 +6,7 @@ import ./versions.nix ({ version, sha256 }:
inherit version;
src = fetchurl {
url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz";
url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz";
inherit sha256;
};
@@ -18,7 +18,7 @@ import ./versions.nix ({ version, sha256 }:
installPhase = ''
mkdir -p $out/share/zabbix/
cp -a ${if stdenv.lib.versionAtLeast version "5.0.0" then "ui/." else "frontends/php/."} $out/share/zabbix/
cp -a ${if lib.versionAtLeast version "5.0.0" then "ui/." else "frontends/php/."} $out/share/zabbix/
cp ${phpConfig} $out/share/zabbix/conf/zabbix.conf.php
'';