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

Merge remote-tracking branch 'upstream/master' into HEAD

Browse Source
This commit is contained in:
Jörg Thalheim
2021-01-17 18:08:59 +01:00
parent 9541eb734d d87e126913
commit 1279bf812c
303 changed files with 1084 additions and 964 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/system/augeas/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, readline, libxml2 }:
{ lib, stdenv, fetchurl, pkg-config, readline, libxml2 }:
stdenv.mkDerivation rec {
pname = "augeas";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
url = "http://download.augeas.net/${pname}-${version}.tar.gz";
sha256 = "11ybhb13wkkilsn7b416a1dn61m1xrq0lbdpkhp5w61jrk4l469j";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ readline libxml2 ];
meta = with lib; {
pkgs/tools/system/chase/default.nix
+2 -2
View File
@@ -1,10 +1,10 @@
{ lib, stdenv, fetchurl ,pkgconfig, libatomic_ops , boehmgc }:
{ lib, stdenv, fetchurl ,pkg-config, libatomic_ops , boehmgc }:
stdenv.mkDerivation rec {
pname = "chase";
version = "0.5.2";
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libatomic_ops boehmgc ] ;
src = fetchurl {
url = "mirror://debian/pool/main/c/chase/chase_${version}.orig.tar.gz";
pkgs/tools/system/collectd/default.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, fetchpatch, darwin, callPackage
, autoreconfHook
, pkgconfig
, pkg-config
, libtool
, ...
}@args:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sha256 = "1mh97afgq6qgmpvpr84zngh58m0sl1b4wimqgvvk376188q09bjv";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [
libtool
] ++ lib.optionals stdenv.isDarwin [
pkgs/tools/system/das_watchdog/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, libgtop, xmessage, which, pkgconfig }:
{ lib, stdenv, fetchgit, libgtop, xmessage, which, pkg-config }:
stdenv.mkDerivation {
pname = "das_watchdog";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "02y1vfb3wh4908xjj1kpyf8kgxk29x8dw7yl3pnl220qz2gi99vr";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libgtop xmessage which ];
installPhase = ''
pkgs/tools/system/efibootmgr/default.nix
+2 -2
View File
@@ -1,10 +1,10 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, efivar, popt }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, efivar, popt }:
stdenv.mkDerivation rec {
pname = "efibootmgr";
version = "17";
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ efivar popt ];
pkgs/tools/system/efivar/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, buildPackages, fetchFromGitHub, fetchurl, pkgconfig, popt }:
{ lib, stdenv, buildPackages, fetchFromGitHub, fetchurl, pkg-config, popt }:
stdenv.mkDerivation rec {
pname = "efivar";
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
postPatch = "sed '/^OPTIMIZE /s/-flto//' -i Make.defaults";
NIX_CFLAGS_COMPILE = "-Wno-error=stringop-truncation";
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ popt ];
depsBuildBuild = [ buildPackages.stdenv.cc ];
pkgs/tools/system/evemu/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, autoreconfHook, pkgconfig, pythonPackages
{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, pythonPackages
, libevdev
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "1m38fxwy2s82vb2qm9aqxinws12akmqqq7q66is931lc3awqkbah";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [ pythonPackages.python pythonPackages.evdev libevdev ];
pkgs/tools/system/gdmap/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, gtk2, pkgconfig, libxml2, intltool, gettext }:
{ lib, stdenv, fetchurl, gtk2, pkg-config, libxml2, intltool, gettext }:
stdenv.mkDerivation rec {
name = "gdmap-0.8.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ gtk2 libxml2 intltool gettext ];
patches = [ ./get_sensitive.patch ./set_flags.patch ];
pkgs/tools/system/hardinfo/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, which, pkgconfig, gtk2, pcre, glib, libxml2
{ lib, stdenv, fetchurl, which, pkg-config, gtk2, pcre, glib, libxml2
, libsoup ? null
}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
# Not adding 'hostname' command, the build shouldn't depend on what the build
# host is called.
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ which gtk2 pcre glib libxml2 libsoup ];
# Fixes '#error You must compile this program without "-O"'
pkgs/tools/system/illum/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchgit, pkgconfig, ninja, libevdev, libev }:
{ lib, stdenv, fetchgit, pkg-config, ninja, libevdev, libev }:
stdenv.mkDerivation {
version = "0.4";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "05v3hz7n6b1mlhc6zqijblh1vpl0ja1y8y0lafw7mjdz03wxhfdb";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ninja libevdev libev ];
configurePhase = ''
pkgs/tools/system/lshw/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, fetchpatch
, withGUI ? false, gtk2, pkgconfig, sqlite # compile GUI
, withGUI ? false, gtk2, pkg-config, sqlite # compile GUI
}:
let numVersion = "02.18"; # :(
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
})
];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = lib.optionals withGUI [ gtk2 sqlite ];
pkgs/tools/system/netdata/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkgconfig
{ lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkg-config
, CoreFoundation, IOKit, libossp_uuid
, curl, libcap, libuuid, lm_sensors, zlib, fetchpatch
, nixosTests
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
sha256 = "1266jbfw55r1zh00xi6c90j2fs9hw8hmsb7686rh04l8mffny9f4";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ curl.dev zlib.dev ]
++ optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ]
++ optionals (!stdenv.isDarwin) [ libcap.dev libuuid.dev ]
pkgs/tools/system/pciutils/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, zlib, kmod, which
{ lib, stdenv, fetchurl, pkg-config, zlib, kmod, which
, static ? stdenv.hostPlatform.isStatic
, darwin ? null
}:
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1ss0rnfsx8gvqjxaji4mvbhf9xyih4cadmgadbwwv8mnx1xvjh4x";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ zlib kmod which ] ++
lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit;
pkgs/tools/system/psensor/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, pkgconfig, lm_sensors, libgtop, libatasmart, gtk3
{ stdenv, lib, fetchurl, pkg-config, lm_sensors, libgtop, libatasmart, gtk3
, libnotify, udisks2, libXNVCtrl, wrapGAppsHook
}:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1ark901va79gfq5p8h8dqypjgm3f8crmj37520q3slwz2rfphkq8";
};
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
nativeBuildInputs = [ pkg-config wrapGAppsHook ];
buildInputs = [
lm_sensors libgtop libatasmart gtk3 libnotify udisks2
pkgs/tools/system/psstop/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib }:
stdenv.mkDerivation rec {
pname = "psstop";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "03ir3jjpzm7q8n1qc5jr99hqarr9r529w1zb6f7q4wak2vfj7w9h";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ glib ];
pkgs/tools/system/rsyslog/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson
{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson
, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysqlclient ? null, postgresql ? null
, libdbi ? null, net-snmp ? null, libuuid ? null, curl ? null, gnutls ? null
, libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
#patches = [ ./fix-gnutls-detection.patch ];
nativeBuildInputs = [ pkgconfig autoreconfHook ];
nativeBuildInputs = [ pkg-config autoreconfHook ];
buildInputs = [
fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc
postgresql libdbi net-snmp libuuid curl gnutls libgcrypt liblognorm openssl
pkgs/tools/system/syslog-ng-incubator/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, syslogng
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, syslogng
, eventlog, perl, python, yacc, protobufc, libivykis, libcap, czmq
}:
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "17y85cqcyfbp882gaii731cvz5bg1s8rgda271jh6kgnrz5rbd4s";
};
nativeBuildInputs = [ pkgconfig autoreconfHook yacc ];
nativeBuildInputs = [ pkg-config autoreconfHook yacc ];
buildInputs = [
glib syslogng eventlog perl python protobufc libivykis libcap czmq
pkgs/tools/system/syslog-ng/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, openssl, libcap, curl, which
, eventlog, pkgconfig, glib, python, systemd, perl
, eventlog, pkg-config, glib, python, systemd, perl
, riemann_c_client, protobufc, pcre, libnet
, json_c, libuuid, libivykis, mongoc, rabbitmq-c
, libesmtp
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "1s56q8k69sdrqsh3y9lr4di01fqw7xb49wr0dz75jmz084yg8kmg";
};
nativeBuildInputs = [ pkgconfig which ];
nativeBuildInputs = [ pkg-config which ];
buildInputs = [
libcap
pkgs/tools/system/testdisk/default.nix
+2 -2
View File
@@ -3,7 +3,7 @@
, fetchurl
, ncurses
, libuuid
, pkgconfig
, pkg-config
, libjpeg
, zlib
, libewf
@@ -39,7 +39,7 @@ assert enableQt -> qwt != null;
++ lib.optional enableExtFs e2fsprogs
++ lib.optionals enableQt [ qtbase qttools qwt ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
NIX_CFLAGS_COMPILE="-Wno-unused";
pkgs/tools/system/thermald/default.nix
+2 -2
View File
@@ -11,7 +11,7 @@
, libtool
, libxml2
, lzma
, pkgconfig
, pkg-config
, lib, stdenv
, upower
}:
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
docbook_xml_dtd_412
gtk-doc
libtool
pkgconfig
pkg-config
];
buildInputs = [
pkgs/tools/system/thinkfan/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, libyamlcpp, pkgconfig
{ lib, stdenv, fetchFromGitHub, cmake, libyamlcpp, pkg-config
, smartSupport ? false, libatasmart }:
stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
"-DUSE_NVML=OFF"
] ++ lib.optional smartSupport "-DUSE_ATASMART=ON";
nativeBuildInputs = [ cmake pkgconfig ];
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ libyamlcpp ] ++ lib.optional smartSupport libatasmart;
pkgs/tools/system/vboot_reference/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitiles, pkgconfig, libuuid, openssl, libyaml, lzma }:
{ lib, stdenv, fetchFromGitiles, pkg-config, libuuid, openssl, libyaml, lzma }:
stdenv.mkDerivation rec {
version = "20180311";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1zja4ma6flch08h5j2l1hqnxmw2xwylidnddxxd5y2x05dai9ddj";
};
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl libuuid libyaml lzma ];
enableParallelBuilding = true;
pkgs/tools/system/wsmancli/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkgconfig
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config
, openssl, openwsman }:
stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "0a67fz9lj7xkyfqim6ai9kj7v6hzx94r1bg0g0l5dymgng648b9j";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ openwsman openssl ];