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

setcap-wrapper: Merging with upstream master and resolving conflicts

Browse Source
This commit is contained in:
Parnell Springmeyer
2017-01-25 11:08:05 -08:00
parent 1f9494b752 104c3db659
commit bae00e8aa8
4612 changed files with 200748 additions and 124553 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/system/bootchart/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, lib, pkgconfig, glib, gtk, python27, pythonPackages }:
{stdenv, fetchurl, lib, pkgconfig, glib, gtk2, python27, pythonPackages }:
stdenv.mkDerivation rec {
version = "0.14.7";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1abn4amsyys6vwn7csxsxny94n24ycca3xhqxqcmdc4j0dzn3kmb";
};
buildInputs = [ pkgconfig glib gtk python27 pythonPackages.wrapPython pythonPackages.pygtk ];
buildInputs = [ pkgconfig glib gtk2 python27 pythonPackages.wrapPython pythonPackages.pygtk ];
pythonPath = with pythonPackages; [ pygtk pycairo ];
installPhase = ''
pkgs/tools/system/chase/default.nix
+27
View File
@@ -0,0 +1,27 @@
{ stdenv, fetchurl ,pkgconfig, libatomic_ops , boehmgc }:
stdenv.mkDerivation rec {
name = "chase-${version}";
version = "0.5.2";
buildInputs = [ pkgconfig libatomic_ops boehmgc ] ;
src = fetchurl {
url = "mirror://debian/pool/main/c/chase/chase_${version}.orig.tar.gz";
sha256 = "68d95c2d4dc45553b75790fcea4413b7204a2618dff148116ca9bdb0310d737f";
};
doCheck = true;
makeFlags = [ "-e" ];
makeFlagsArray="LIBS=-lgc";
meta = with stdenv.lib ; {
description = "Follow a symlink and print out its target file";
longDescription = ''
A commandline program that chases symbolic filesystems links to the original file
'';
homepage = "https://qa.debian.org/developer.php?login=rotty%40debian.org";
license = licenses.gpl2Plus;
maintainers = [ maintainers.polyrod ];
platforms = platforms.all;
};
}
pkgs/tools/system/collectd/default.nix
+11 -7
View File
@@ -30,21 +30,28 @@
, varnish ? null
, yajl ? null
, net_snmp ? null
, hiredis ? null
, libmnl ? null
}:
stdenv.mkDerivation rec {
version = "5.5.2";
version = "5.6.0";
name = "collectd-${version}";
src = fetchurl {
url = "http://collectd.org/files/${name}.tar.bz2";
sha256 = "03w2pawbshl2wrl4cmyw8alsi0pvamb6ibxni96mjzhqc903lzq1";
sha256 = "08w6fjzczi2psk7va0xkjh9pigpar6sbjx2a6ayq4dmc3zcvpzzh";
};
buildInputs = [
pkgconfig curl iptables libatasmart libcredis libdbi libgcrypt libmemcached
cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt
lm_sensors libxml2 lvm2 libmysql postgresql protobufc rabbitmq-c rrdtool
varnish yajl jdk libtool python udev net_snmp
varnish yajl jdk libtool python udev net_snmp hiredis libmnl
];
patches = [
# Replace deprecated readdir_r() with readdir() to avoid a fatal warning.
./readdir-fix.patch
];
# for some reason libsigrok isn't auto-detected
@@ -52,14 +59,11 @@ stdenv.mkDerivation rec {
stdenv.lib.optional (libsigrok != null) "--with-libsigrok" ++
stdenv.lib.optional (python != null) "--with-python=${python}/bin/python";
# Fix build on Glibc 2.24.
NIX_CFLAGS_COMPILE = "-Wno-error=cpp -Wno-error=deprecated-declarations";
meta = with stdenv.lib; {
description = "Daemon which collects system performance statistics periodically";
homepage = http://collectd.org;
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = [ maintainers.bjornfor ];
maintainers = with maintainers; [ bjornfor fpletz ];
};
}
pkgs/tools/system/collectd/readdir-fix.patch
+55
View File
@@ -0,0 +1,55 @@
diff -Naur collectd-5.6.0/src/vserver.c collectd-5.6.0/src/vserver.c
--- collectd-5.6.0/src/vserver.c 2016-09-11 01:10:25.279038699 -0700
+++ collectd-5.6.0/src/vserver.c 2016-09-25 07:44:40.771177458 -0700
@@ -132,15 +132,8 @@
static int vserver_read (void)
{
-#if NAME_MAX < 1024
-# define DIRENT_BUFFER_SIZE (sizeof (struct dirent) + 1024 + 1)
-#else
-# define DIRENT_BUFFER_SIZE (sizeof (struct dirent) + NAME_MAX + 1)
-#endif
-
DIR *proc;
struct dirent *dent; /* 42 */
- char dirent_buffer[DIRENT_BUFFER_SIZE];
errno = 0;
proc = opendir (PROCDIR);
@@ -165,19 +158,23 @@
int status;
- status = readdir_r (proc, (struct dirent *) dirent_buffer, &dent);
- if (status != 0)
- {
- char errbuf[4096];
- ERROR ("vserver plugin: readdir_r failed: %s",
- sstrerror (errno, errbuf, sizeof (errbuf)));
- closedir (proc);
- return (-1);
- }
- else if (dent == NULL)
+ errno = 0;
+ dent = readdir (proc);
+ if (dent == NULL)
{
- /* end of directory */
- break;
+ if (errno != 0)
+ {
+ char errbuf[4096];
+ ERROR ("vserver plugin: readdir failed: %s",
+ sstrerror (errno, errbuf, sizeof (errbuf)));
+ closedir (proc);
+ return (-1);
+ }
+ else
+ {
+ /* end of directory */
+ break;
+ }
}
if (dent->d_name[0] == '.')
pkgs/tools/system/confd/default.nix
+1 -1
View File
@@ -15,5 +15,5 @@ buildGoPackage rec {
sha256 = "0rz533575hdcln8ciqaz79wbnga3czj243g7fz8869db6sa7jwlr";
};
goDeps = ./deps.json;
goDeps = ./deps.nix;
}
pkgs/tools/system/confd/deps.json
-74
View File
@@ -1,74 +0,0 @@
[
{
"goPackagePath": "github.com/Sirupsen/logrus",
"fetch": {
"type": "git",
"url": "https://github.com/Sirupsen/logrus",
"rev": "be52937128b38f1d99787bb476c789e2af1147f1",
"sha256": "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4"
}
},
{
"goPackagePath": "github.com/coreos/go-etcd",
"fetch": {
"type": "git",
"url": "https://github.com/coreos/go-etcd",
"rev": "9847b93751a5fbaf227b893d172cee0104ac6427",
"sha256": "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4"
}
},
{
"goPackagePath": "github.com/ugorji/go",
"fetch": {
"type": "git",
"url": "https://github.com/ugorji/go",
"rev": "03e33114d4d60a1f37150325e15f51b0fa6fc4f6",
"sha256": "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v"
}
},
{
"goPackagePath": "github.com/samuel/go-zookeeper",
"fetch": {
"type": "git",
"url": "https://github.com/samuel/go-zookeeper",
"rev": "5bb5cfc093ad18a28148c578f8632cfdb4d802e4",
"sha256": "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z"
}
},
{
"goPackagePath": "github.com/BurntSushi/toml",
"fetch": {
"type": "git",
"url": "https://github.com/BurntSushi/toml",
"rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4",
"sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"
}
},
{
"goPackagePath": "github.com/kelseyhightower/memkv",
"fetch": {
"type": "git",
"url": "https://github.com/kelseyhightower/memkv",
"rev": "7f9c7f36f45ba80c62fe22779ee78d9b4ca36580",
"sha256": "090x65kr3gqh8fc8z4rm9hc2r0v0k7rfm5vsbmhdh21f48ixw540"
}
},
{
"goPackagePath": "github.com/armon/consul-api",
"fetch": {
"type": "git",
"url": "https://github.com/armon/consul-api",
"rev": "f79efe463cdbb62f6d5a55f879a63ec554eb13e5",
"sha256": "1rkmzfhsazj9p2b6ywvs8yramzvxfxyvplzxi0ldvhcv04887gcp"
}
},
{
"goPackagePath": "github.com/garyburd/redigo",
"fetch": {
"type": "git",
"url": "https://github.com/garyburd/redigo",
"rev": "535138d7bcd717d6531c701ef5933d98b1866257",
"sha256": "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v"
}
}
]
pkgs/tools/system/confd/deps.nix
+74
View File
@@ -0,0 +1,74 @@
[
{
goPackagePath = "github.com/Sirupsen/logrus";
fetch = {
type = "git";
url = "https://github.com/Sirupsen/logrus";
rev = "be52937128b38f1d99787bb476c789e2af1147f1";
sha256 = "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4";
};
}
{
goPackagePath = "github.com/coreos/go-etcd";
fetch = {
type = "git";
url = "https://github.com/coreos/go-etcd";
rev = "9847b93751a5fbaf227b893d172cee0104ac6427";
sha256 = "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4";
};
}
{
goPackagePath = "github.com/ugorji/go";
fetch = {
type = "git";
url = "https://github.com/ugorji/go";
rev = "03e33114d4d60a1f37150325e15f51b0fa6fc4f6";
sha256 = "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v";
};
}
{
goPackagePath = "github.com/samuel/go-zookeeper";
fetch = {
type = "git";
url = "https://github.com/samuel/go-zookeeper";
rev = "5bb5cfc093ad18a28148c578f8632cfdb4d802e4";
sha256 = "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z";
};
}
{
goPackagePath = "github.com/BurntSushi/toml";
fetch = {
type = "git";
url = "https://github.com/BurntSushi/toml";
rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4";
sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw";
};
}
{
goPackagePath = "github.com/kelseyhightower/memkv";
fetch = {
type = "git";
url = "https://github.com/kelseyhightower/memkv";
rev = "7f9c7f36f45ba80c62fe22779ee78d9b4ca36580";
sha256 = "090x65kr3gqh8fc8z4rm9hc2r0v0k7rfm5vsbmhdh21f48ixw540";
};
}
{
goPackagePath = "github.com/armon/consul-api";
fetch = {
type = "git";
url = "https://github.com/armon/consul-api";
rev = "f79efe463cdbb62f6d5a55f879a63ec554eb13e5";
sha256 = "1rkmzfhsazj9p2b6ywvs8yramzvxfxyvplzxi0ldvhcv04887gcp";
};
}
{
goPackagePath = "github.com/garyburd/redigo";
fetch = {
type = "git";
url = "https://github.com/garyburd/redigo";
rev = "535138d7bcd717d6531c701ef5933d98b1866257";
sha256 = "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v";
};
}
]
pkgs/tools/system/dd_rescue/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, autoconf }:
stdenv.mkDerivation rec {
version = "1.99";
version = "1.99.5";
name = "dd_rescue-${version}";
src = fetchurl {
sha256 = "0gkbwssn134fjyyvjvylyvassw4fwv5mbis9gcb969xdc64dfhg1";
sha256 = "0db94piwcdyqhnlhgfs0bfp0gp2mqyrcr2l5nljapgni31qk4p8j";
url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.bz2";
};
pkgs/tools/system/foreman/default.nix
+5 -20
View File
@@ -1,24 +1,9 @@
{ stdenv, lib, ruby, bundlerEnv, makeWrapper }:
{ bundlerEnv, lib, ruby }:
stdenv.mkDerivation rec {
name = "foreman-${env.gems.foreman.version}";
env = bundlerEnv {
inherit ruby;
name = "${name}-gems";
gemfile = ./Gemfile;
lockfile = ./Gemfile.lock;
gemset = ./gemset.nix;
};
phases = ["installPhase"];
nativeBuildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
makeWrapper ${env}/bin/foreman $out/bin/foreman
'';
bundlerEnv {
inherit ruby;
pname = "foreman";
gemdir = ./.;
meta = with lib; {
description = "Process manager for applications with multiple components";
pkgs/tools/system/freeipmi/default.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{ fetchurl, stdenv, libgcrypt, readline }:
stdenv.mkDerivation rec {
version = "1.5.3";
version = "1.5.5";
name = "freeipmi-${version}";
src = fetchurl {
url = "mirror://gnu/freeipmi/${name}.tar.gz";
sha256 = "0s4q7imc4r3g9lkd92bnvw70679q83b0irrlw895i5nc05dj4djx";
sha256 = "0lzzvhzbdl1cxin4xz3lirqxsjwmjr5ac0qr4g21cqsv2j6vj85f";
};
buildInputs = [ libgcrypt readline ];
pkgs/tools/system/gdmap/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, gtk, pkgconfig, libxml2, intltool, gettext }:
{ stdenv, fetchurl, gtk2, pkgconfig, libxml2, intltool, gettext }:
stdenv.mkDerivation rec {
name = "gdmap-0.8.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052";
};
buildInputs = [ gtk pkgconfig libxml2 intltool gettext ];
buildInputs = [ gtk2 pkgconfig libxml2 intltool gettext ];
patches = [ ./get_sensitive.patch ./set_flags.patch ];
pkgs/tools/system/hiera-eyaml/default.nix
+5 -18
View File
@@ -1,22 +1,9 @@
{ lib, bundlerEnv, stdenv }:
{ lib, bundlerEnv, ruby }:
let
name = "hiera-eyaml-${env.gems.hiera-eyaml.version}";
env = bundlerEnv {
inherit name;
gemfile = ./Gemfile;
lockfile = ./Gemfile.lock;
gemset = ./gemset.nix;
};
in stdenv.mkDerivation {
inherit name;
buildCommand = ''
mkdir -p $out/bin
ln -s ${env}/bin/eyaml $out/bin/eyaml
'';
bundlerEnv {
inherit ruby;
pname = "hiera-eyaml";
gemdir = ./.;
meta = with lib; {
description = "Per-value asymmetric encryption of sensitive data for Hiera";
pkgs/tools/system/honcho/default.nix
+7 -5
View File
@@ -1,13 +1,15 @@
{ stdenv, fetchzip, pythonPackages, buildPythonApplication }:
{ stdenv, fetchFromGitHub, pythonPackages }:
let honcho = buildPythonApplication rec {
let honcho = pythonPackages.buildPythonApplication rec {
name = "honcho-${version}";
version = "0.6.6";
namePrefix = "";
src = fetchzip {
url = "https://github.com/nickstenning/honcho/archive/v${version}.tar.gz";
md5 = "f5e6a7f6c1d0c167d410d7f601b4407e";
src = fetchFromGitHub {
owner = "nickstenning";
repo = "honcho";
rev = "v${version}";
sha256 = "0lawwcyrrsd9z9jcr94qn1yabl9bzc529jkpc51jq720fhdlfcr0";
};
buildInputs = with pythonPackages; [ nose mock jinja2 ];
pkgs/tools/system/iops/default.nix
+1 -1
View File
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
'';
homepage = http://www.vanheusden.com/iops/;
license = licenses.gpl2;
maintainers = with maintainers; davidak;
maintainers = with maintainers; [ davidak ];
platforms = platforms.linux; # build problems on Darwin
};
}
pkgs/tools/system/ior/default.nix
+29
View File
@@ -0,0 +1,29 @@
{ stdenv, fetchurl, openmpi, automake, autoconf, perl }:
let
version = "3.0.1";
sha256 = "039rh4z3lsj4vqjsqgakk0b7dkrdrkkzj0p1cjikpc9gn36zpghc";
in
stdenv.mkDerivation rec {
name = "ior-${version}";
src = fetchurl {
url = "https://github.com/LLNL/ior/archive/${version}.tar.gz";
inherit sha256;
};
buildInputs = [ openmpi automake autoconf perl ];
enableParallelBuilding = true;
preConfigure = "./bootstrap";
meta = with stdenv.lib; {
homepage = "http://www.nersc.gov/users/computational-systems/cori/nersc-8-procurement/trinity-nersc-8-rfp/nersc-8-trinity-benchmarks/ior/";
description = "Parallel file system I/O performance test";
license = licenses.gpl2;
platforms = platforms.linux;
maintainers = with maintainers; [ bzizou ];
};
}
pkgs/tools/system/ipmiutil/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
baseName = "ipmiutil";
version = "2.9.9";
version = "3.0.1";
name = "${baseName}-${version}";
src = fetchurl {
url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
sha256 = "1xi5d49zmcczya4iq662wkx39slrk3d4p2dzpfjcc0m0hs1y1b5y";
sha256 = "179hvarw0mk3j1z4102q4692q4mx06y259llr891by0pri0bsb3n";
};
buildInputs = [ openssl ];
pkgs/tools/system/lshw/default.nix
+23 -17
View File
@@ -1,27 +1,33 @@
{ stdenv, fetchurl
, withGUI? false, gtk? null, pkgconfig? null, sqlite? null # compile GUI
}:
stdenv.mkDerivation rec {
{ stdenv, lib, fetchurl, fetchpatch
, withGUI ? false, gtk2, pkgconfig, sqlite # compile GUI
}:
name = "lshw-${version}";
version = "02.17b";
let numVersion = "02.18"; # :(
in
stdenv.mkDerivation rec {
name = "lshw-${numVersion}b";
version = "B.${numVersion}";
src = fetchurl {
url = http://ezix.org/software/files/lshw-B.02.17.tar.gz;
sha256 = "1728b96gyjmrp31knzips9azn6wkfdp5k5dnbil7h7hgz99w177b";
url = "http://ezix.org/software/files/lshw-${version}.tar.gz";
sha256 = "0brwra4jld0d53d7jsgca415ljglmmx1l2iazpj4ndilr48yy8mf";
};
buildInputs = [] ++ stdenv.lib.optional withGUI [ gtk pkgconfig sqlite ];
patches = [ (fetchpatch {
# fix crash in scan_dmi_sysfs() when run as non-root
url = "https://github.com/lyonel/lshw/commit/fbdc6ab15f7eea0ddcd63da355356ef156dd0d96.patch";
sha256 = "147wyr5m185f8swsmb4q1ahs9r1rycapbpa2548aqbv298bbish3";
})];
postBuild = if withGUI then "make gui" else "";
buildInputs = lib.optionals withGUI [ gtk2 pkgconfig sqlite ];
installPhase = ''
make DESTDIR="$out" install
${if withGUI then "make DESTDIR=$out install-gui" else ""}
mv $out/usr/* $out
rmdir $out/usr
mv $out/sbin $out/bin
'';
makeFlags = [ "PREFIX=$(out)" ];
buildFlags = [ "all" ] ++ lib.optional withGUI "gui";
installTargets = [ "install" ] ++ lib.optional withGUI "install-gui";
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = http://ezix.org/project/wiki/HardwareLiSter;
pkgs/tools/system/monit/default.nix
+5 -5
View File
@@ -1,15 +1,15 @@
{stdenv, fetchurl, openssl, bison, flex, pam, usePAM ? stdenv.isLinux }:
{stdenv, fetchurl, openssl, bison, flex, pam, zlib, usePAM ? stdenv.isLinux }:
stdenv.mkDerivation rec {
name = "monit-5.10";
name = "monit-5.20.0";
src = fetchurl {
url = "${meta.homepage}dist/${name}.tar.gz";
sha256 = "0lwlils6b59kr6zg328q113c7mrpggqydpq4l6j52sqv3dd1b49p";
sha256 = "13drg4k9r9drn7bpj3n04kkf1l29q05jdccdar6yc6hcqmg3kb7b";
};
nativeBuildInputs = [ bison flex ];
buildInputs = [ openssl ] ++ stdenv.lib.optionals usePAM [ pam ];
buildInputs = [ openssl zlib.dev ] ++ stdenv.lib.optionals usePAM [ pam ];
configureFlags = [
"--with-ssl-incl-dir=${openssl.dev}/include"
pkgs/tools/system/netdata/default.nix
+20 -4
View File
@@ -1,20 +1,36 @@
{ stdenv, fetchFromGitHub, autoreconfHook, zlib, pkgconfig }:
{ stdenv, fetchFromGitHub, autoreconfHook, zlib, pkgconfig, libuuid }:
stdenv.mkDerivation rec{
version = "1.0.0";
version = "1.4.0";
name = "netdata-${version}";
src = fetchFromGitHub {
rev = "v${version}";
owner = "firehol";
repo = "netdata";
sha256 = "03107ny98zks05p44jzypkk4lw8lbvmqja5b537ln6cnrgp20yvq";
sha256 = "1wknxci2baj6f7rl8z8j7haaz122jmbb74aw7i3xbj2y61cs58n8";
};
buildInputs = [ autoreconfHook zlib pkgconfig ];
buildInputs = [ autoreconfHook zlib pkgconfig libuuid ];
# Allow UI to load when running as non-root
patches = [ ./web_access.patch ];
# Build will fail trying to create /var/{cache,lib,log}/netdata without this
postPatch = ''
sed -i '/dist_.*_DATA = \.keep/d' src/Makefile.am
'';
configureFlags = [
"--localstatedir=/var"
];
# App fails on runtime if the default config file is not detected
# The upstream installer does prepare an empty file too
postInstall = ''
touch $out/etc/netdata/netdata.conf
'';
meta = with stdenv.lib; {
description = "Real-time performance monitoring tool";
homepage = http://netdata.firehol.org;
pkgs/tools/system/netdata/web_access.patch
+16 -15
View File
@@ -1,19 +1,20 @@
--- a/src/web_client.c.orig 2016-04-17 11:34:20.044455323 +0200
+++ b/src/web_client.c 2016-04-17 11:34:47.432897957 +0200
@@ -291,14 +291,14 @@
buffer_sprintf(w->response.data, "File '%s' does not exist, or is not accessible.", filename);
return 404;
}
--- a/src/web_client.c.orig
+++ b/src/web_client.c
@@ -331,7 +331,7 @@
buffer_sprintf(w->response.data, "File '%s' does not exist, or is not accessible.", webfilename);
return 404;
}
-
+#if 0
// check if the file is owned by us
if(stat.st_uid != web_files_uid()) {
error("%llu: File '%s' is owned by user %d (I run as user %d). Access Denied.", w->id, webfilename, stat.st_uid, getuid());
buffer_sprintf(w->response.data, "Access to file '%s' is not permitted.", filename);
return 403;
}
// check if the file is owned by expected user
if(stat.st_uid != web_files_uid()) {
error("%llu: File '%s' is owned by user %u (expected user %u). Access Denied.", w->id, webfilename, stat.st_uid, web_files_uid());
@@ -345,7 +345,7 @@
buffer_sprintf(w->response.data, "Access to file '%s' is not permitted.", webfilename);
return 403;
}
-
+#endif
if((stat.st_mode & S_IFMT) == S_IFDIR) {
snprintf(webfilename, FILENAME_MAX+1, "%s/index.html", filename);
return mysendfile(w, webfilename);
if((stat.st_mode & S_IFMT) == S_IFDIR) {
snprintfz(webfilename, FILENAME_MAX, "%s/index.html", filename);
return mysendfile(w, webfilename);
pkgs/tools/system/pciutils/default.nix
+4 -2
View File
@@ -1,13 +1,15 @@
{ stdenv, fetchurl, pkgconfig, zlib, kmod, which }:
stdenv.mkDerivation rec {
name = "pciutils-3.5.1"; # with database from 2016-05
name = "pciutils-3.5.2"; # with database from 2016-10
src = fetchurl {
url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz";
sha256 = "0byl2f897w5lhs4bvr6p7qwcz9bllj2zyfv7nywbcbsnb9ha9wrb";
sha256 = "1z2y4f3cyvm7a0dyan0n6jpb3p9pvh35lrim0058slj0kwd1969s";
};
patches = [ ./module-dir.diff ];
buildInputs = [ pkgconfig zlib kmod which ];
makeFlags = "SHARED=yes PREFIX=\${out}";
pkgs/tools/system/pciutils/module-dir.diff
+23
View File
@@ -0,0 +1,23 @@
Don't override libkmod's way of finding modules.
(We override that behavior in nixpkgs to fit nixos.)
diff --git a/ls-kernel.c b/ls-kernel.c
index 78b70f1..ecacd0e 100644
--- a/ls-kernel.c
+++ b/ls-kernel.c
@@ -29,13 +29,7 @@ show_kernel_init(void)
if (show_kernel_inited >= 0)
return show_kernel_inited;
- struct utsname uts;
- if (uname(&uts) < 0)
- die("uname() failed: %m");
- char *name = alloca(64 + strlen(uts.release));
- sprintf(name, "/lib/modules/%s", uts.release);
-
- kmod_ctx = kmod_new(name, NULL);
+ kmod_ctx = kmod_new(NULL, NULL);
if (!kmod_ctx)
{
fprintf(stderr, "lspci: Unable to initialize libkmod context\n");
pkgs/tools/system/plan9port/default.nix
+22 -16
View File
@@ -8,13 +8,13 @@
}:
stdenv.mkDerivation rec {
name = "plan9port-2015-11-10";
name = "plan9port-2016-04-18";
src = fetchgit {
# Latest, same as on github, google code is old
url = "https://plan9port.googlesource.com/plan9";
rev = "0d2dfbc";
sha256 = "1h16wvps4rfkjim2ihkmniw8wzl7yill5910larci1c70x6zcicf";
rev = "35d43924484b88b9816e40d2f6bff4547f3eec47";
sha256 = "1dvg580rkav09fra2gnrzh271b4fw6bgqfv4ib7ds5k3j55ahcdc";
};
patches = [
@@ -29,23 +29,29 @@ stdenv.mkDerivation rec {
find . -type f \
-exec sed -i -e 's/_SVID_SOURCE/_DEFAULT_SOURCE/g' {} \; \
-exec sed -i -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/g' {} \;
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
#add missing ctrl+c\z\x\v keybind for non-Darwin
substituteInPlace src/cmd/acme/text.c \
--replace "case Kcmd+'c':" "case 0x03: case Kcmd+'c':" \
--replace "case Kcmd+'z':" "case 0x1a: case Kcmd+'z':" \
--replace "case Kcmd+'x':" "case 0x18: case Kcmd+'x':" \
--replace "case Kcmd+'v':" "case 0x16: case Kcmd+'v':"
'';
builder = ./builder.sh;
NIX_LDFLAGS="-lgcc_s";
buildInputs = stdenv.lib.optionals
(!stdenv.isDarwin)
[ which
perl
libX11
fontconfig
xproto
libXt
xextproto
libXext
freetype #fontsrv wants ft2build.h. provides system fonts for acme and sam.
];
buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [
which
perl
libX11
fontconfig
xproto
libXt
xextproto
libXext
freetype #fontsrv wants ft2build.h. provides system fonts for acme and sam.
];
enableParallelBuilding = true;
@@ -53,7 +59,7 @@ stdenv.mkDerivation rec {
homepage = "http://swtch.com/plan9port/";
description = "Plan 9 from User Space";
license = licenses.lpl-102;
maintainers = with stdenv.lib.maintainers; [ ftrvxmtrx kovirobi ];
maintainers = with maintainers; [ ftrvxmtrx kovirobi ];
platforms = platforms.unix;
};
pkgs/tools/system/r10k/Gemfile
+5
View File
@@ -0,0 +1,5 @@
# frozen_string_literal: true
# A sample Gemfile
source "https://rubygems.org"
gem "r10k"
pkgs/tools/system/r10k/Gemfile.lock
+49
View File
@@ -0,0 +1,49 @@
GEM
remote: https://rubygems.org/
specs:
colored (1.2)
cri (2.6.1)
colored (~> 1.2)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
faraday_middleware (0.10.0)
faraday (>= 0.7.4, < 0.10)
fast_gettext (1.1.0)
gettext (3.2.2)
locale (>= 2.0.5)
text (>= 1.3.0)
gettext-setup (0.7)
fast_gettext (~> 1.1.0)
gettext (>= 3.0.2)
locale (2.1.2)
log4r (1.1.10)
minitar (0.5.4)
multi_json (1.12.1)
multipart-post (2.0.0)
puppet_forge (2.2.2)
faraday (~> 0.9.0)
faraday_middleware (>= 0.9.0, < 0.11.0)
gettext-setup (>= 0.3)
minitar
semantic_puppet (~> 0.1.0)
r10k (2.4.3)
colored (= 1.2)
cri (~> 2.6.1)
gettext-setup (~> 0.5)
log4r (= 1.1.10)
minitar
multi_json (~> 1.10)
puppet_forge (~> 2.2)
semantic_puppet (~> 0.1.0)
semantic_puppet (0.1.4)
gettext-setup (>= 0.3)
text (1.3.1)
PLATFORMS
ruby
DEPENDENCIES
r10k
BUNDLED WITH
1.12.5
pkgs/tools/system/r10k/default.nix
+33
View File
@@ -0,0 +1,33 @@
{ stdenv, lib, bundlerEnv, makeWrapper, git, gnutar, gzip, ruby }:
stdenv.mkDerivation rec {
name = "r10k-${version}";
version = "2.4.3";
env = bundlerEnv {
name = "${name}-gems";
gemfile = ./Gemfile;
lockfile = ./Gemfile.lock;
gemset = ./gemset.nix;
inherit ruby;
};
phases = ["installPhase"];
buildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/bin
makeWrapper ${env}/bin/r10k $out/bin/r10k \
--set PATH ${stdenv.lib.makeBinPath [ git gnutar gzip ]}
'';
meta = with lib; {
description = "Puppet environment and module deployment";
homepage = https://github.com/puppetlabs/r10k;
license = licenses.asl20;
maintainers = with maintainers; [ zimbatm ];
};
}
pkgs/tools/system/r10k/gemset.nix
+130
View File
@@ -0,0 +1,130 @@
{
colored = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx";
type = "gem";
};
version = "1.2";
};
cri = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0zzwvwzrrlmx6c5j7bqc63ib952h37i357xn97m3h8bjd7zyv79l";
type = "gem";
};
version = "2.6.1";
};
faraday = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6";
type = "gem";
};
version = "0.9.2";
};
faraday_middleware = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0nxia26xzy8i56qfyz1bg8dg9yb26swpgci8n5jry8mh4bnx5r5h";
type = "gem";
};
version = "0.10.0";
};
fast_gettext = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0mxahyywhml3c206am11h6d93rk358l2vl0j764i8ndzir5z5h75";
type = "gem";
};
version = "1.1.0";
};
gettext = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1d2i1zfqvaxqi01g9vvkfkf5r85c5nfj2zwpd2ib9vvkjavhn9cx";
type = "gem";
};
version = "3.2.2";
};
gettext-setup = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "116frghrvcpzqhgi6skpmr56lzk35z44sbjkjn3lnlpr33sav03l";
type = "gem";
};
version = "0.7";
};
locale = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x";
type = "gem";
};
version = "2.1.2";
};
log4r = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ri90q0frfmigkirqv5ihyrj59xm8pq5zcmf156cbdv4r4l2jicv";
type = "gem";
};
version = "1.1.10";
};
minitar = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vpdjfmdq1yc4i620frfp9af02ia435dnpj8ybsd7dc3rypkvbka";
type = "gem";
};
version = "0.5.4";
};
multi_json = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk";
type = "gem";
};
version = "1.12.1";
};
multipart-post = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
type = "gem";
};
version = "2.0.0";
};
puppet_forge = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1m2npid04dvli2r9h5cm2ccjmq0275xn4swi3x8wx5yzrixw98wv";
type = "gem";
};
version = "2.2.2";
};
r10k = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0cqwci30r2566xcf8wz7dgamj6i4q9cblgkgmmdm9w2klqzx30j7";
type = "gem";
};
version = "2.4.3";
};
semantic_puppet = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zs19rsyv3f2zwhqi8cqbs87a6fzyl30aw2zqcxb8iz5m7xkd4kc";
type = "gem";
};
version = "0.1.4";
};
text = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "1x6kkmsr49y3rnrin91rv8mpc3dhrf3ql08kbccw8yffq61brfrg";
type = "gem";
};
version = "1.3.1";
};
}
pkgs/tools/system/rsyslog/default.nix
+2 -2
View File
@@ -11,11 +11,11 @@ let
mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}";
in
stdenv.mkDerivation rec {
name = "rsyslog-8.17.0";
name = "rsyslog-8.21.0";
src = fetchurl {
url = "http://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz";
sha256 = "1fazpbllr3wk8aw41zk7b6iirds4h8j3im080nf8my2cjssij7pc";
sha256 = "1arrhc9fw79sp7dxkf7gyfwibyr2i1000pfds5c7n43mgglgvcdx";
};
#patches = [ ./fix-gnutls-detection.patch ];
pkgs/tools/system/sg3_utils/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "sg3_utils-1.31";
name = "sg3_utils-1.42";
src = fetchurl {
url = "http://sg.danny.cz/sg/p/${name}.tgz";
sha256 = "190hhkhl096fxkspkr93lrq1n79xz5c5i2n4n4g998qc3yv3hjyq";
sha256 = "1wwy7iiz1lvc32c777yd4vp0c0dqfdlm5jrsm3aa62xx141pmjqx";
};
meta = {
pkgs/tools/system/systemd-journal2gelf/default.nix
+24
View File
@@ -0,0 +1,24 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "SystemdJournal2Gelf-${version}";
version = "20160414";
goPackagePath = "github.com/parse-nl/SystemdJournal2Gelf";
src = fetchFromGitHub {
rev = "aba2f24e59f190ab8830bf40f92f890e62a9ec9f";
owner = "parse-nl";
repo = "SystemdJournal2Gelf";
sha256 = "012fmnb44681dgz21n1dlb6vh923bpk5lkqir1q40kfz6pacq64n";
};
goDeps = ./deps.nix;
meta = with stdenv.lib; {
description = "Export entries from systemd's journal and send them to a graylog server using gelf";
license = licenses.bsd2;
maintainers = with maintainers; [ fadenb fpletz globin ];
platforms = platforms.linux;
};
}
pkgs/tools/system/systemd-journal2gelf/deps.nix
+11
View File
@@ -0,0 +1,11 @@
[
{
goPackagePath = "github.com/DECK36/go-gelf";
fetch = {
type = "git";
url = "https://github.com/DECK36/go-gelf";
rev = "4bc6123df0946a1c23fd54e0c1d0ed68b44fd99f";
sha256 = "071zdwcl8ld05gv88yym1p7xq72igd6jj05n5d7v01hn6rvj48ay";
};
}
]
pkgs/tools/system/thermald/default.nix
+2 -3
View File
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "thermald-${version}";
version = "1.5.3";
version = "1.5.4";
src = fetchFromGitHub {
owner = "01org";
repo = "thermal_daemon";
rev = "v${version}";
sha256 = "0k10sl262d9slrln1vkgsxlr1pnfxzd3ycs552bl7ynf0zxpl48h";
sha256 = "0yrlnm1blfxi97af4dbx6xm5w1p8r20raiim1ng08gbqbgnjg56g";
};
buildInputs = [ autoconf automake libtool pkgconfig dbus_libs dbus_glib libxml2 ];
@@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
preInstall = "sysconfdir=$out/etc";
meta = with stdenv.lib; {
description = "Thermal Daemon";
homepage = "https://01.org/linux-thermal-daemon";
pkgs/tools/system/vboot_reference/default.nix
+1 -1
View File
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "14d3a93ha5k4al4ib43nyn1ppx7kgb12xw6mkflhx8nxmx8827nc";
};
buildInputs = [ pkgconfig openssl ] ++
buildInputs = [ pkgconfig openssl stdenv.cc.libc.static ] ++
(if libuuid == null
then []
else [ (stdenv.lib.overrideDerivation libuuid