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

Merge remote-tracking branch 'origin/master' into gcc-9

Browse Source
This commit is contained in:
Franz Pletz
2019-12-26 14:17:36 +01:00
parent 602bccd1a8 4d2dd15546
commit 77b6c3cd06
4311 changed files with 115681 additions and 107815 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/system/bootchart/default.nix
-31
View File
@@ -1,31 +0,0 @@
{stdenv, fetchFromGitHub, pkgconfig, glib, gtk2, python2Packages }:
stdenv.mkDerivation rec {
version = "0.14.8";
pname = "bootchart";
src = fetchFromGitHub {
owner = "mmeeks";
repo = "bootchart";
rev = version;
sha256 = "12ja2hp6f49416zfjdx0kjfmlkh9wl9b7wz7gk372kps4gjnypqx";
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ glib gtk2 python2Packages.python python2Packages.wrapPython python2Packages.pygtk ];
pythonPath = with python2Packages; [ pygtk pycairo ];
installPhase = ''
make install DESTDIR=$out BINDIR=/bin PY_LIBDIR=/lib/${python2Packages.python.libPrefix}
wrapProgram $out/bin/pybootchartgui \
--prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
'';
meta = with stdenv.lib; {
homepage = http://www.bootchart.org/;
description = "Performance analysis and visualization of the GNU/Linux boot process";
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}
pkgs/tools/system/collectd/plugins.nix
+3 -3
View File
@@ -24,7 +24,7 @@
, lm_sensors
, mongoc
, mosquitto
, net_snmp
, net-snmp
, postgresql
, protobufc
, python
@@ -243,10 +243,10 @@ let
buildInputs = stdenv.lib.optionals stdenv.isLinux [ libatasmart udev ];
};
snmp = {
buildInputs = stdenv.lib.optionals stdenv.isLinux [ net_snmp ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ net-snmp ];
};
snmp_agent = {
buildInputs = stdenv.lib.optionals stdenv.isLinux [ net_snmp ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ net-snmp ];
};
statsd = {};
swap = {};
pkgs/tools/system/facter/default.nix
+2 -2
View File
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "facter";
version = "3.14.5";
version = "3.14.6";
src = fetchFromGitHub {
sha256 = "0xzzhlsfw8yd3ac4kvr3za0rlkgfw28dzxzi5i1qbhzljivvipm5";
sha256 = "1zfff1mpdwnlnm8dmmlvysw2zdsnglgk5nvhhzx8zyk0zyz0nj54";
rev = version;
repo = pname;
owner = "puppetlabs";
pkgs/tools/system/fakeroot/default.nix
+1 -1
View File
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
'';
meta = {
homepage = http://fakeroot.alioth.debian.org/;
homepage = https://salsa.debian.org/clint/fakeroot;
description = "Give a fake root environment through LD_PRELOAD";
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [viric];
pkgs/tools/system/fio/default.nix
+3 -3
View File
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "fio";
version = "3.16";
version = "3.17";
src = fetchFromGitHub {
owner = "axboe";
repo = "fio";
rev = "fio-${version}";
sha256 = "10ygvmzsrqh2bs8v0a304gkl8h50437xfaz1ck7j2ymckipnbha0";
sha256 = "1s37w8bhg23ml1f89x0bkaifywlkgh31305vmip4xfvh3j3vjbym";
};
buildInputs = [ python zlib ]
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Flexible IO Tester - an IO benchmark tool";
homepage = "http://git.kernel.dk/?p=fio.git;a=summary;";
homepage = "https://git.kernel.dk/cgit/fio/";
license = licenses.gpl2;
platforms = platforms.unix;
};
pkgs/tools/system/hardinfo/default.nix
+1 -1
View File
@@ -45,6 +45,6 @@ stdenv.mkDerivation rec {
description = "Display information about your hardware and operating system";
license = licenses.gpl2;
maintainers = with maintainers; [ bjornfor ];
platforms = platforms.linux;
platforms = [ "x86_64-linux" "i686-linux" ]; # ARMv7 and AArch64 are unsupported
};
}
pkgs/tools/system/inxi/default.nix
+2 -2
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "inxi";
version = "3.0.36-1";
version = "3.0.37-1";
src = fetchFromGitHub {
owner = "smxi";
repo = "inxi";
rev = version;
sha256 = "04134l323vwd0g2bffj11rnpw2jgs9la6aqrmv8vh7w9mq5nd57y";
sha256 = "15wvj9w601ci3bavd1hk5qlm8dfm7a7cjglczk29yir5yw2jww3f";
};
buildInputs = [ perl makeWrapper ];
pkgs/tools/system/ipmiutil/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
baseName = "ipmiutil";
version = "3.1.4";
version = "3.1.5";
name = "${baseName}-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
sha256 = "0rca9bjn46i3xzah53l1r5bv1493773chj8x11by2asxyl9wlf4r";
sha256 = "18q1nc2caaixy3dr2axdvwq37iz916piarvmg0jdfzaxfpaxpk2q";
};
buildInputs = [ openssl ];
pkgs/tools/system/java-service-wrapper/default.nix
+41
View File
@@ -0,0 +1,41 @@
{ stdenv, fetchurl
, jdk
, ant, cunit, ncurses
}:
stdenv.mkDerivation rec {
pname = "java-service-wrapper";
version = "3.5.41";
src = fetchurl {
url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
sha256 = "0wvazc4y134brn99aa4rc9jdh1h2q3l7qhhvbcs6lhf4ym47sskm";
};
buildInputs = [ jdk ];
nativeBuildInputs = [ ant cunit ncurses ];
buildPhase = ''
export ANT_HOME=${ant}
export JAVA_HOME=${jdk}/lib/openjdk/jre/
export JAVA_TOOL_OPTIONS=-Djava.home=$JAVA_HOME
export CLASSPATH=${jdk}/lib/openjdk/lib/tools.jar
${if stdenv.isi686 then "./build32.sh" else "./build64.sh"}
'';
installPhase = ''
mkdir -p $out/{bin,lib}
cp bin/wrapper $out/bin/wrapper
cp lib/wrapper.jar $out/lib/wrapper.jar
cp lib/libwrapper.so $out/lib/libwrapper.so
'';
meta = with stdenv.lib; {
description = "Enables a Java Application to be run as a Windows Service or Unix Daemon";
homepage = "https://wrapper.tanukisoftware.com/";
license = licenses.gpl2;
platforms = [ "x86_64-linux" "i686-linux" ];
maintainers = [ maintainers.suhr ];
};
}
pkgs/tools/system/logcheck/default.nix
+1 -1
View File
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
Logcheck helps spot problems and security violations in your logfiles automatically and will send the results to you by e-mail.
Logcheck was part of the Abacus Project of security tools, but this version has been rewritten.
'';
homepage = http://logcheck.alioth.debian.org/;
homepage = https://salsa.debian.org/debian/logcheck;
license = licenses.gpl2;
maintainers = [ maintainers.bluescreen303 ];
};
pkgs/tools/system/minijail/default.nix
+17 -11
View File
@@ -1,14 +1,13 @@
{ stdenv, fetchgit, libcap }:
{ stdenv, fetchFromGitiles, libcap }:
stdenv.mkDerivation rec {
shortname = "minijail";
name = "${shortname}-${version}";
version = "android-9.0.0_r3";
pname = "minijail";
version = "android-10.0.0_r9";
src = fetchgit {
src = fetchFromGitiles {
url = "https://android.googlesource.com/platform/external/minijail";
rev = version;
sha256 = "1g1g52s3q61amcnx8cv1332sbixpck1bmjzgsrjiw5ix7chrzkp2";
sha256 = "0gcfsyim1krrddcklydqfxl8mamaxgail2xl5qp9yclq60km8f22";
};
buildInputs = [ libcap ];
@@ -20,13 +19,20 @@ stdenv.mkDerivation rec {
sed -i '/#include <asm\/siginfo.h>/ d' signal_handler.c
'';
postPatch = ''
patchShebangs platform2_preinstall.sh
'';
postBuild = ''
./platform2_preinstall.sh ${version} $out/include/chromeos
'';
installPhase = ''
mkdir -p $out/lib
mkdir -p $out/lib/pkgconfig $out/include/chromeos $out/bin
cp -v *.so $out/lib
mkdir -p $out/include
cp -v libminijail.h $out/include
mkdir -p $out/bin
cp minijail0 $out/bin
cp -v *.pc $out/lib/pkgconfig
cp -v libminijail.h scoped_minijail.h $out/include/chromeos
cp -v minijail0 $out/bin
'';
meta = {
pkgs/tools/system/osquery/0001-Fix-CMake-configuration-for-Nix.patch
-41
View File
@@ -1,41 +0,0 @@
From 511400b8ec0794588df88e2bb1c45cc6a4a51b1e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 26 May 2019 23:10:02 +0200
Subject: [PATCH] Fix CMake configuration for Nix
* -fno-limit-debug-info: CLang specific, patch away to support both
CLang and GCC.
* Dropped unnecessary `lvm-internal` and `daemonclient` references.
---
CMakeLists.txt | 1 -
osquery/tables/CMakeLists.txt | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f545d6c9..cfe68ddb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -328,7 +328,6 @@ if (POSIX)
# To be safe, only include them when building 'release' outputs.
add_compile_options(
"$<$<CONFIG:RELEASE>:-g>"
- "$<$<CONFIG:RELEASE>:-fno-limit-debug-info>"
"$<$<CONFIG:RELEASE>:-fPIE>"
"$<$<CONFIG:RELEASE>:-fpie>"
"$<$<CONFIG:RELEASE>:-fPIC>"
diff --git a/osquery/tables/CMakeLists.txt b/osquery/tables/CMakeLists.txt
index 470bdf1d..caa6ab6f 100644
--- a/osquery/tables/CMakeLists.txt
+++ b/osquery/tables/CMakeLists.txt
@@ -68,7 +68,7 @@ if(LINUX)
set(TABLE_PLATFORM "linux")
ADD_OSQUERY_LINK_ADDITIONAL("libresolv.so")
- ADD_OSQUERY_LINK_ADDITIONAL("cryptsetup devmapper lvm2app lvm-internal daemonclient")
+ ADD_OSQUERY_LINK_ADDITIONAL("cryptsetup devmapper lvm2app")
ADD_OSQUERY_LINK_ADDITIONAL("gcrypt gpg-error")
ADD_OSQUERY_LINK_ADDITIONAL("blkid")
ADD_OSQUERY_LINK_ADDITIONAL("ip4tc")
--
2.19.2
pkgs/tools/system/osquery/default.nix
-149
View File
@@ -1,149 +0,0 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, cmake, python
, udev, audit, aws-sdk-cpp, cryptsetup, lvm2, libgcrypt, libarchive
, libgpgerror, libuuid, iptables, dpkg, lzma, bzip2, rpm
, beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, gflags
, thrift, boost, rocksdb_lite, glog, gbenchmark, snappy
, openssl, file, doxygen
, gtest, fpm, zstd, rdkafka, rapidjson, fetchgit, fetchurl, libelfin
, smartmontools, which, git, cscope, ctags, ssdeep
}:
let
overrides = {
# use older `lvm2` source for osquery, the 2.03 sourcetree
# will break osquery due to the lacking header `lvm2app.h`.
#
# https://github.com/NixOS/nixpkgs/pull/51756#issuecomment-446035295
lvm2 = lvm2.overrideAttrs (old: rec {
name = "lvm2-${version}";
version = "2.02.183";
src = fetchgit {
url = "git://sourceware.org/git/lvm2.git";
rev = "v${version}";
sha256 = "1ny3srcsxd6kj59zq1cman5myj8kzw010wbyc6mrpk4kp823r5nx";
};
});
# use smartmontools fork to programatically retrieve SMART information.
# https://github.com/facebook/osquery/pull/4133
smartmontools = smartmontools.overrideAttrs (old: rec {
name = "smartmontools-${version}";
version = "0.3.1";
src = fetchFromGitHub {
owner = "allanliu";
repo = "smartmontools";
rev = "v${version}";
sha256 = "1i72fk2ranrky02h7nh9l3va4kjzj0lx1gr477zkxd44wf3w0pjf";
};
# Apple build fix doesn't apply here and isn't needed as we
# only support `osquery` on Linux.
patches = [];
});
# dpkg 1.19.2 dropped api in `<dpkg/dpkg-db.h>` which breaks compilation.
dpkg = dpkg.overrideAttrs (old: rec {
name = "dpkg-${version}";
version = "1.19.0.5";
src = fetchurl {
url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
sha256 = "1dc5kp3fqy1k66fly6jfxkkg7w6d0jy8szddpfyc2xvzga94d041";
};
});
# filter out static linking configuration to avoid that the library will
# be linked both statically and dynamically.
gflags = gflags.overrideAttrs (old: {
cmakeFlags = stdenv.lib.filter (f: (builtins.match ".*STATIC.*" f) == null) old.cmakeFlags;
});
};
in
stdenv.mkDerivation rec {
pname = "osquery";
version = "3.3.2";
# this is what `osquery --help` will show as the version.
OSQUERY_BUILD_VERSION = version;
OSQUERY_PLATFORM = "NixOS;";
src = fetchFromGitHub {
owner = "facebook";
repo = pname;
rev = version;
sha256 = "0nrwmzmbziacs3y0nljyc73bibr3w68myjpfwkicg9zgkq4qihij";
};
patches = [ ./0001-Fix-CMake-configuration-for-Nix.patch ];
NIX_CFLAGS_COMPILE = [
"-I${libxml2.dev}/include/libxml2"
];
nativeBuildInputs = [ python which git cscope ctags cmake pkgconfig doxygen fpm ]
++ (with python.pkgs; [ jinja2 ]);
buildInputs = [
udev
audit
(aws-sdk-cpp.override {
apis = [ "firehose" "kinesis" "sts" "ec2" ];
customMemoryManagement = false;
})
overrides.lvm2
libgcrypt
libarchive
libgpgerror
libuuid
iptables
overrides.dpkg
lzma
bzip2
rpm
beecrypt
augeas
libxml2
sleuthkit
yara
lldpd
overrides.gflags
thrift
boost
glog
gbenchmark
snappy
openssl
file
cryptsetup
gtest
zstd
rdkafka
rapidjson
rocksdb_lite
libelfin
ssdeep
overrides.smartmontools
];
cmakeFlags = [ "-DSKIP_TESTS=1" ];
preConfigure = ''
cp -r ${fetchFromGitHub {
owner = "osquery";
repo = "third-party";
rev = "32e01462fbea75d3b1904693f937dfd62eaced15";
sha256 = "0va24gmgk43a1lyjs63q9qrhvpv8gmqjzpjr5595vhr16idv8wyf";
}}/* third-party
chmod +w -R third-party
'';
meta = with lib; {
description = "SQL powered operating system instrumentation, monitoring, and analytics";
homepage = https://osquery.io/;
license = licenses.bsd3;
platforms = platforms.linux;
maintainers = with maintainers; [ cstrahan ma27 ];
broken = true;
};
}
pkgs/tools/system/proot/default.nix
+1 -1
View File
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
'';
meta = with stdenv.lib; {
homepage = http://proot-me.github.io;
homepage = https://proot-me.github.io;
description = "User-space implementation of chroot, mount --bind and binfmt_misc";
platforms = platforms.linux;
license = licenses.gpl2;
pkgs/tools/system/rsyslog/default.nix
+5 -5
View File
@@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, 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
, libdbi ? null, net-snmp ? null, libuuid ? null, curl ? null, gnutls ? null
, libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null
, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null
, libmongo-client ? null, czmq ? null, rabbitmq-c ? null, hiredis ? null, mongoc ? null
@@ -12,11 +12,11 @@ let
in
stdenv.mkDerivation rec {
pname = "rsyslog";
version = "8.1910.0";
version = "8.1911.0";
src = fetchurl {
url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz";
sha256 = "14qczsj12spx0m3dz1pkxnacwi5njr0syamnmi1rg8ri5xlyw682";
sha256 = "01713vwz3w5fx9b97286h1rx9hxhjsdah96nyhh75bb23impgx71";
};
#patches = [ ./fix-gnutls-detection.patch ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [
fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc
postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl
postgresql libdbi net-snmp libuuid curl gnutls libgcrypt liblognorm openssl
librelp libksi liblogging libnet hadoop rdkafka libmongo-client czmq
rabbitmq-c hiredis mongoc
] ++ stdenv.lib.optional (libmysqlclient != null) libmysqlclient
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
(mkFlag (libmysqlclient != null) "mysql")
(mkFlag (postgresql != null) "pgsql")
(mkFlag (libdbi != null) "libdbi")
(mkFlag (net_snmp != null) "snmp")
(mkFlag (net-snmp != null) "snmp")
(mkFlag (libuuid != null) "uuid")
(mkFlag (curl != null) "elasticsearch")
(mkFlag (gnutls != null) "gnutls")
pkgs/tools/system/stress-ng/default.nix
+2 -2
View File
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "stress-ng";
version = "0.10.08";
version = "0.10.11";
src = fetchurl {
url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz";
sha256 = "1kkmznn0y5wxi7x9nlhzyfy933bv66113in4rf0raw6brymympaa";
sha256 = "16z45fmvncpa0bv91dpwarqfm9p7aiqkmlcpmv2y23rh6sikhkdq";
};
postPatch = ''
pkgs/tools/system/syslog-ng/default.nix
+5 -9
View File
@@ -5,17 +5,13 @@
, libesmtp
}:
let
pname = "syslog-ng";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
version = "3.23.1";
pname = "syslog-ng";
version = "3.24.1";
src = fetchurl {
url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz";
sha256 = "0f6d19ysf2bd12fzagrbbrdp854pwx794ymp8d0zfc98k30wydpv";
url = "https://github.com/${pname}/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
sha256 = "0ggsb5867mca83f5mqsi0j7hslvmj8943xynd5myjas5gcss1l6l";
};
nativeBuildInputs = [ pkgconfig which ];
@@ -59,7 +55,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = https://www.balabit.com/network-security/syslog-ng/;
homepage = https://www.syslog-ng.com;
description = "Next-generation syslogd with advanced networking and filtering capabilities";
license = licenses.gpl2;
maintainers = with maintainers; [ fpletz ];
pkgs/tools/system/thermald/default.nix
+2 -2
View File
@@ -3,13 +3,13 @@
stdenv.mkDerivation rec {
pname = "thermald";
version = "1.9";
version = "1.9.1";
src = fetchFromGitHub {
owner = "01org";
repo = "thermal_daemon";
rev = "v${version}";
sha256 = "1ajhivl9jifcf12nbk281yayk7666v65m249aclyli0bz1kh8cfs";
sha256 = "0iagc3jqpnh6q2fa1gx4wx6r8qg0556j60xr159zqg95djr4dv99";
};
nativeBuildInputs = [ pkgconfig ];
pkgs/tools/system/vboot_reference/default.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, pkgconfig, libuuid, openssl, libyaml, lzma }:
{ stdenv, fetchFromGitiles, pkgconfig, libuuid, openssl, libyaml, lzma }:
stdenv.mkDerivation rec {
version = "20180311";
@@ -6,8 +6,8 @@ stdenv.mkDerivation rec {
pname = "vboot_reference";
src = fetchgit {
url = https://chromium.googlesource.com/chromiumos/platform/vboot_reference;
src = fetchFromGitiles {
url = "https://chromium.googlesource.com/chromiumos/platform/vboot_reference";
rev = checkout;
sha256 = "1zja4ma6flch08h5j2l1hqnxmw2xwylidnddxxd5y2x05dai9ddj";
};
pkgs/tools/system/yeshup/default.nix
+3 -3
View File
@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
name = "yeshup-${builtins.substring 0 7 rev}";
rev = "5461a8f957c686ccd0240be3f0fd8124d7381b08";
pname = "yeshup";
version = "unstable-2013-10-29";
src = fetchFromGitHub {
owner = "RhysU";
repo = "yeshup";
inherit rev;
rev = "5461a8f957c686ccd0240be3f0fd8124d7381b08";
sha256 = "1wwbc158y46jsmdi1lp0m3dlbr9kvzvwxfvzj6646cpy9d6h21v9";
};