Merge branch 'staging'
This commit is contained in:
commit
e10cd27269
@ -20,7 +20,7 @@ let
|
|||||||
pkgs.desktop_file_utils pkgs.ibus
|
pkgs.desktop_file_utils pkgs.ibus
|
||||||
pkgs.shared_mime_info # for update-mime-database
|
pkgs.shared_mime_info # for update-mime-database
|
||||||
glib # for gsettings
|
glib # for gsettings
|
||||||
gtk3 # for gtk-update-icon-cache
|
gtk3.out # for gtk-update-icon-cache
|
||||||
glib_networking gvfs dconf gnome-backgrounds gnome_control_center
|
glib_networking gvfs dconf gnome-backgrounds gnome_control_center
|
||||||
gnome-menus gnome_settings_daemon gnome_shell
|
gnome-menus gnome_settings_daemon gnome_shell
|
||||||
gnome_themes_standard defaultIconTheme gnome-shell-extensions
|
gnome_themes_standard defaultIconTheme gnome-shell-extensions
|
||||||
|
@ -63,6 +63,8 @@ stdenv.mkDerivation rec {
|
|||||||
postInstall = optionalString (!stdenv.isDarwin) ''
|
postInstall = optionalString (!stdenv.isDarwin) ''
|
||||||
substituteInPlace "$out/lib/gtk-3.0/3.0.0/printbackends/libprintbackend-cups.la" \
|
substituteInPlace "$out/lib/gtk-3.0/3.0.0/printbackends/libprintbackend-cups.la" \
|
||||||
--replace '-L${gmp.dev}/lib' '-L${gmp.out}/lib'
|
--replace '-L${gmp.dev}/lib' '-L${gmp.out}/lib'
|
||||||
|
# The updater is needed for nixos env and it's tiny.
|
||||||
|
moveToOutput bin/gtk-update-icon-cache "$out"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
{ stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig }:
|
{ stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "libmicrohttpd-0.9.50";
|
name = "libmicrohttpd-0.9.52";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
|
url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
|
||||||
sha256 = "1mzbqr6sqisppz88mh73bbh5sw57g8l87qvhcjdx5pmbd183idni";
|
sha256 = "1smgxw6jv81yybg86bzr4c2sn7a31apf8q4zz0kpch9xfrp7yyal";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = [ "out" "dev" "devdoc" "info" ];
|
outputs = [ "out" "dev" "devdoc" "info" ];
|
||||||
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
homepage = http://www.gnu.org/software/libmicrohttpd/;
|
homepage = http://www.gnu.org/software/libmicrohttpd/;
|
||||||
|
|
||||||
maintainers = [ maintainers.eelco maintainers.vrthra ];
|
maintainers = with maintainers; [ eelco vrthra fpletz ];
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "libnetfilter_conntrack-${version}";
|
name = "libnetfilter_conntrack-${version}";
|
||||||
version = "1.0.5";
|
version = "1.0.6";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2";
|
url = "http://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2";
|
||||||
sha256 = "0fnpja3g8s38cp7ipija5pvhfgna1gybn0z2bl276nk08fppv7gw";
|
sha256 = "1svzyf3rq9nbrcw1jsricgyhh7x1am8iqn6kjr6mzrw42810ik7g";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ libmnl ];
|
buildInputs = [ libmnl ];
|
||||||
|
@ -1,20 +1,21 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, libmnl }:
|
{ stdenv, fetchurl, pkgconfig, libmnl }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "libnftnl-1.0.6";
|
name = "libnftnl-1.0.7";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://netfilter.org/projects/libnftnl/files/${name}.tar.bz2";
|
url = "http://netfilter.org/projects/libnftnl/files/${name}.tar.bz2";
|
||||||
sha256 = "0zmh190c7212zvzjsn5lm6pf399r4arq7dliiqq6grd174m96fxd";
|
sha256 = "10irjrylcfkbp11617yr19vpfhgl54w0kw02jhj0i1abqv5nxdlv";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ pkgconfig libmnl ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
|
buildInputs = [ libmnl ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "A userspace library providing a low-level netlink API to the in-kernel nf_tables subsystem";
|
description = "A userspace library providing a low-level netlink API to the in-kernel nf_tables subsystem";
|
||||||
homepage = http://netfilter.org/projects/libnftnl;
|
homepage = http://netfilter.org/projects/libnftnl;
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
maintainers = with maintainers; [ wkennington ];
|
maintainers = with maintainers; [ wkennington fpletz ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
{ stdenv, fetchurl, ncurses ? null, perl ? null }:
|
{ stdenv, fetchurl, ncurses ? null, perl ? null }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "liboping-1.8.0";
|
name = "liboping-1.9.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://verplant.org/liboping/files/${name}.tar.bz2";
|
url = "http://verplant.org/liboping/files/${name}.tar.bz2";
|
||||||
sha256 = "1nsvlsvapc64h0anip2hz5ydbgk3an94xqiaa9kivcw1r6193jqx";
|
sha256 = "0c1mdx9ixqypayhm617jjv9kr6y60nh3mnryafjzv23bnn41vfs4";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ ncurses perl ];
|
buildInputs = [ ncurses perl ];
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
{ stdenv, fetchurl, flex, bison }:
|
{ stdenv, fetchurl, flex, bison }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "libpcap-1.7.4";
|
name = "libpcap-1.8.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.tcpdump.org/release/${name}.tar.gz";
|
url = "http://www.tcpdump.org/release/${name}.tar.gz";
|
||||||
sha256 = "1c28ykkizd7jqgzrfkg7ivqjlqs9p6lygp26bsw2i0z8hwhi3lvs";
|
sha256 = "07jlhc66z76dipj4j5v3dig8x6h3k6cb36kmnmpsixf3zmlvqgb7";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ flex bison ];
|
nativeBuildInputs = [ flex bison ];
|
||||||
@ -29,9 +29,10 @@ stdenv.mkDerivation rec {
|
|||||||
configureFlags = configureFlags ++ [ "ac_cv_linux_vers=2" ];
|
configureFlags = configureFlags ++ [ "ac_cv_linux_vers=2" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
meta = {
|
meta = with stdenv.lib; {
|
||||||
homepage = http://www.tcpdump.org;
|
homepage = http://www.tcpdump.org;
|
||||||
description = "Packet Capture Library";
|
description = "Packet Capture Library";
|
||||||
platforms = stdenv.lib.platforms.unix;
|
platforms = platforms.unix;
|
||||||
|
maintainers = with maintainers; [ fpletz ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -6,11 +6,11 @@
|
|||||||
let
|
let
|
||||||
inherit (pythonPackages) python pygobject2;
|
inherit (pythonPackages) python pygobject2;
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
name = "libvirt-glib-0.2.3";
|
name = "libvirt-glib-1.0.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://libvirt.org/sources/glib/${name}.tar.gz";
|
url = "http://libvirt.org/sources/glib/${name}.tar.gz";
|
||||||
sha256 = "1pahj8qa7k2307sd57rwqwq1hijya02v0sxk91hl3cw48niimcf3";
|
sha256 = "0iwa5sdbii52pjpdm5j37f67sdmf0kpcky4liwhy1nf43k85i4fa";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
@ -9,11 +9,11 @@
|
|||||||
# if you update, also bump pythonPackages.libvirt or it will break
|
# if you update, also bump pythonPackages.libvirt or it will break
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "libvirt-${version}";
|
name = "libvirt-${version}";
|
||||||
version = "2.5.0";
|
version = "3.0.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://libvirt.org/sources/${name}.tar.xz";
|
url = "http://libvirt.org/sources/${name}.tar.xz";
|
||||||
sha256 = "07nbh6zhaxx5i1s1acnppf8rzkzb2ppgv35jw7grbbnnpzpzz7c1";
|
sha256 = "0php6wxjcilpir0miwg06yd2ha25zi9fv2apvvgv5c8k1svjd7cx";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./build-on-bsd.patch ];
|
patches = [ ./build-on-bsd.patch ];
|
||||||
|
@ -1,18 +1,20 @@
|
|||||||
{ fetchurl, stdenv, flex, bison, pkgconfig, libmnl, libnfnetlink
|
{ fetchurl, stdenv, flex, bison, pkgconfig, libmnl, libnfnetlink
|
||||||
, libnetfilter_conntrack, libnetfilter_queue, libnetfilter_cttimeout
|
, libnetfilter_conntrack, libnetfilter_queue, libnetfilter_cttimeout
|
||||||
, libnetfilter_cthelper }:
|
, libnetfilter_cthelper, systemd }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "conntrack-tools-${version}";
|
name = "conntrack-tools-${version}";
|
||||||
version = "1.4.3";
|
version = "1.4.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.netfilter.org/projects/conntrack-tools/files/${name}.tar.bz2";
|
url = "http://www.netfilter.org/projects/conntrack-tools/files/${name}.tar.bz2";
|
||||||
sha256 = "0mrzrzp6y41pmxc6ixc4fkgz6layrpwsmzb522adzzkc6mhcqg5g";
|
sha256 = "0v5spmlcw5n6va8z34f82vcpynadb0b54pnjazgpadf0qkyg9jmp";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ libmnl libnfnetlink libnetfilter_conntrack libnetfilter_queue
|
buildInputs = [
|
||||||
libnetfilter_cttimeout libnetfilter_cthelper ];
|
libmnl libnfnetlink libnetfilter_conntrack libnetfilter_queue
|
||||||
|
libnetfilter_cttimeout libnetfilter_cthelper systemd
|
||||||
|
];
|
||||||
nativeBuildInputs = [ flex bison pkgconfig ];
|
nativeBuildInputs = [ flex bison pkgconfig ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
@ -20,6 +22,6 @@ stdenv.mkDerivation rec {
|
|||||||
description = "Connection tracking userspace tools";
|
description = "Connection tracking userspace tools";
|
||||||
platforms = platforms.linux;
|
platforms = platforms.linux;
|
||||||
license = licenses.gpl2Plus;
|
license = licenses.gpl2Plus;
|
||||||
maintainers = with maintainers; [ nckx ];
|
maintainers = with maintainers; [ nckx fpletz ];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
{stdenv, fetchurl, bison, flex, libnetfilter_conntrack, libnftnl, libmnl}:
|
{ stdenv, fetchurl, bison, flex
|
||||||
|
, libnetfilter_conntrack, libnftnl, libmnl }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "iptables-${version}";
|
name = "iptables-${version}";
|
||||||
@ -9,9 +10,9 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "0q0w1x4aijid8wj7dg1ny9fqwll483f1sqw7kvkskd8q1c52mdsb";
|
sha256 = "0q0w1x4aijid8wj7dg1ny9fqwll483f1sqw7kvkskd8q1c52mdsb";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [bison flex];
|
nativeBuildInputs = [ bison flex ];
|
||||||
|
|
||||||
buildInputs = [libnetfilter_conntrack libnftnl libmnl];
|
buildInputs = [ libnetfilter_conntrack libnftnl libmnl ];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
export NIX_LDFLAGS="$NIX_LDFLAGS -lmnl -lnftnl"
|
export NIX_LDFLAGS="$NIX_LDFLAGS -lmnl -lnftnl"
|
||||||
@ -22,10 +23,13 @@ stdenv.mkDerivation rec {
|
|||||||
--enable-shared
|
--enable-shared
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = {
|
outputs = [ "out" "dev" ];
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
description = "A program to configure the Linux IP packet filtering ruleset";
|
description = "A program to configure the Linux IP packet filtering ruleset";
|
||||||
homepage = http://www.netfilter.org/projects/iptables/index.html;
|
homepage = http://www.netfilter.org/projects/iptables/index.html;
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = platforms.linux;
|
||||||
|
maintainers = with maintainers; [ fpletz ];
|
||||||
downloadPage = "http://www.netfilter.org/projects/iptables/files/";
|
downloadPage = "http://www.netfilter.org/projects/iptables/files/";
|
||||||
updateWalker = true;
|
updateWalker = true;
|
||||||
inherit version;
|
inherit version;
|
||||||
|
@ -1,22 +1,24 @@
|
|||||||
{ stdenv, fetchurl, pkgconfig, docbook2x, docbook_xml_dtd_45
|
{ stdenv, fetchurl, pkgconfig, docbook2x, docbook_xml_dtd_45
|
||||||
, flex, bison, libmnl, libnftnl, gmp, readline }:
|
, flex, bison, libmnl, libnftnl, gmp, readline, iptables }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "nftables-0.6";
|
name = "nftables-0.7";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2";
|
url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2";
|
||||||
sha256 = "0bbcrn9nz75daic8bq7rspvcw3ck7l82vqcvkyyg4mhwbxjn5pny";
|
sha256 = "0hzdqigdx4i6jbpxbdyq4zy4p4waqn8l6vvz7685ikh1v0wr4qzy";
|
||||||
};
|
};
|
||||||
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"CONFIG_MAN=y"
|
"CONFIG_MAN=y"
|
||||||
"DB2MAN=docbook2man"
|
"DB2MAN=docbook2man"
|
||||||
|
"--with-xtables"
|
||||||
];
|
];
|
||||||
|
|
||||||
XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
|
XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
|
||||||
|
|
||||||
buildInputs = [ pkgconfig docbook2x flex bison libmnl libnftnl gmp readline ];
|
nativeBuildInputs = [ pkgconfig docbook2x flex bison ];
|
||||||
|
buildInputs = [ libmnl libnftnl gmp readline iptables ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "The project that aims to replace the existing {ip,ip6,arp,eb}tables framework";
|
description = "The project that aims to replace the existing {ip,ip6,arp,eb}tables framework";
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
{ lib, stdenv, fetchurl, pkgconfig, zlib, libseccomp, fetchpatch, autoreconfHook, ncurses ? null, perl ? null, pam, systemd, minimal ? false }:
|
{ lib, stdenv, fetchurl, pkgconfig, zlib, fetchpatch, shadow
|
||||||
|
, ncurses ? null, perl ? null, pam, systemd, minimal ? false }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "util-linux-${version}";
|
name = "util-linux-${version}";
|
||||||
@ -12,22 +13,13 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "1rzrmdrz51p9sy7vlw5qmj8pmqazm7hgcch5yq242mkvrikyln9c";
|
sha256 = "1rzrmdrz51p9sy7vlw5qmj8pmqazm7hgcch5yq242mkvrikyln9c";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [ ./rtcwake-search-PATH-for-shutdown.patch ];
|
||||||
./rtcwake-search-PATH-for-shutdown.patch
|
|
||||||
(fetchpatch {
|
|
||||||
name = "CVE-2016-2779.diff";
|
|
||||||
url = https://github.com/karelzak/util-linux/commit/8e4925016875c6a4f2ab4f833ba66f0fc57396a2.patch;
|
|
||||||
sha256 = "0kmigkq4s1b1ijrq8vcg2a5cw4qnm065m7cb1jn1q1f4x99ycy60";
|
|
||||||
})];
|
|
||||||
|
|
||||||
outputs = [ "bin" "dev" "out" "man" ];
|
outputs = [ "bin" "dev" "out" "man" ];
|
||||||
|
|
||||||
#FIXME: make it also work on non-nixos?
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
# Substituting store paths would create a circular dependency on systemd
|
|
||||||
substituteInPlace include/pathnames.h \
|
substituteInPlace include/pathnames.h \
|
||||||
--replace "/bin/login" "/run/current-system/sw/bin/login" \
|
--replace "/bin/login" "${shadow}/bin/login"
|
||||||
--replace "/sbin/shutdown" "/run/current-system/sw/bin/shutdown"
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
crossAttrs = {
|
crossAttrs = {
|
||||||
@ -54,11 +46,9 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
makeFlags = "usrbin_execdir=$(bin)/bin usrsbin_execdir=$(bin)/sbin";
|
makeFlags = "usrbin_execdir=$(bin)/bin usrsbin_execdir=$(bin)/sbin";
|
||||||
|
|
||||||
# autoreconfHook is required for CVE-2016-2779
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
|
||||||
# libseccomp is required for CVE-2016-2779
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ zlib pam libseccomp ]
|
[ zlib pam ]
|
||||||
++ lib.optional (ncurses != null) ncurses
|
++ lib.optional (ncurses != null) ncurses
|
||||||
++ lib.optional (systemd != null) systemd
|
++ lib.optional (systemd != null) systemd
|
||||||
++ lib.optional (perl != null) perl;
|
++ lib.optional (perl != null) perl;
|
||||||
|
@ -1,25 +1,30 @@
|
|||||||
{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, python
|
{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit
|
||||||
, pythonPackages }:
|
, python, pythonPackages }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "4.0.3";
|
version = "5.0.0";
|
||||||
name = "varnish-${version}";
|
name = "varnish-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://repo.varnish-cache.org/source/${name}.tar.gz";
|
url = "http://repo.varnish-cache.org/source/${name}.tar.gz";
|
||||||
sha256 = "01l2iypajkdanxpbvzfxm6vs4jay4dgw7lmchqidnivz15sa3fcl";
|
sha256 = "0jizha1mwqk42zmkrh80y07vfl78mg1d9pp5w83qla4xn9ras0ai";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ pcre libxslt groff ncurses pkgconfig readline python
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
pythonPackages.docutils];
|
buildInputs = [
|
||||||
|
pcre libxslt groff ncurses readline python libedit
|
||||||
|
pythonPackages.docutils
|
||||||
|
];
|
||||||
|
|
||||||
buildFlags = "localstatedir=/var/spool";
|
buildFlags = "localstatedir=/var/spool";
|
||||||
|
|
||||||
meta = {
|
outputs = [ "out" "dev" "man" ];
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
description = "Web application accelerator also known as a caching HTTP reverse proxy";
|
description = "Web application accelerator also known as a caching HTTP reverse proxy";
|
||||||
homepage = "https://www.varnish-cache.org";
|
homepage = "https://www.varnish-cache.org";
|
||||||
license = stdenv.lib.licenses.bsd2;
|
license = licenses.bsd2;
|
||||||
maintainers = [ stdenv.lib.maintainers.garbas ];
|
maintainers = with maintainers; [ garbas fpletz ];
|
||||||
platforms = stdenv.lib.platforms.linux;
|
platforms = platforms.linux;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -2,11 +2,13 @@
|
|||||||
, tcl-8_5 }:
|
, tcl-8_5 }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "rrdtool-1.5.5";
|
name = "rrdtool-1.5.6";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz";
|
url = "http://oss.oetiker.ch/rrdtool/pub/${name}.tar.gz";
|
||||||
sha256 = "1xm6ikzx8iaa6r7v292k8s7srkzhnifamp1szkimgmh5ki26sa1s";
|
sha256 = "1s2cci80g6kbp5p77mkxpfxwvjm1802fw0bjfsa8yjv8g5a7fclq";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ gettext perl pkgconfig libxml2 pango cairo groff ]
|
buildInputs = [ gettext perl pkgconfig libxml2 pango cairo groff ]
|
||||||
++ stdenv.lib.optional stdenv.isDarwin tcl-8_5;
|
++ stdenv.lib.optional stdenv.isDarwin tcl-8_5;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchurl, libpcap, gnumake3 }:
|
{ stdenv, fetchurl, fetchpatch, libpcap, gnumake3, pcre }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "ngrep-1.45";
|
name = "ngrep-1.45";
|
||||||
@ -8,13 +8,32 @@ stdenv.mkDerivation rec {
|
|||||||
sha256 = "19rg8339z5wscw877mz0422wbsadds3mnfsvqx3ihy58glrxv9mf";
|
sha256 = "19rg8339z5wscw877mz0422wbsadds3mnfsvqx3ihy58glrxv9mf";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ gnumake3 libpcap ];
|
patches = [
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/10_debian-build.diff?h=debian/1.45.ds2-14";
|
||||||
|
sha256 = "1p359k54xjbh6r0d0lv1l679n250wxk6j8yyz23gn54kwdc29zfy";
|
||||||
|
})
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/10_man-fixes.diff?h=debian/1.45.ds2-14";
|
||||||
|
sha256 = "1b66zfbsrsvg60j988i6ga9iif1c34fsbq3dp1gi993xy4va8m5k";
|
||||||
|
})
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/20_setlocale.diff?h=debian/1.45.ds2-14";
|
||||||
|
sha256 = "16xbmnmvw5sjidz2qhay68k3xad05g74nrccflavxbi0jba52fdq";
|
||||||
|
})
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/40_ipv6-offsets.diff?h=debian/1.45.ds2-14";
|
||||||
|
sha256 = "0fjlk1sav5nnjapvsa8mvdwjkhgm3kgc6dw7r9h1qx6d3b8cgl76";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
|
buildInputs = [ gnumake3 libpcap pcre ];
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
# Fix broken test for BPF header file
|
# Fix broken test for BPF header file
|
||||||
sed -i "s|BPF=.*|BPF=${libpcap}/include/pcap/bpf.h|" configure
|
sed -i "s|BPF=.*|BPF=${libpcap}/include/pcap/bpf.h|" configure
|
||||||
|
|
||||||
configureFlags="$configureFlags --with-pcap-includes=${libpcap}/include"
|
configureFlags="$configureFlags --enable-ipv6 --enable-pcre --disable-pcap-restart --with-pcap-includes=${libpcap}/include"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
@ -1,11 +1,11 @@
|
|||||||
{ stdenv, fetchurl, libpcap, enableStatic ? false }:
|
{ stdenv, fetchurl, libpcap, enableStatic ? false }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "tcpdump-4.7.4";
|
name = "tcpdump-4.8.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://www.tcpdump.org/release/${name}.tar.gz";
|
url = "http://www.tcpdump.org/release/${name}.tar.gz";
|
||||||
sha256 = "1byr8w6grk08fsq0444jmcz9ar89lq9nf4mjq2cny0w9k8k21rbb";
|
sha256 = "0743ipl0l7ymjss3ybvvc5cbk9kb7s8yl4p3ramp5kwgqhg39r10";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ libpcap ];
|
buildInputs = [ libpcap ];
|
||||||
|
@ -9,6 +9,7 @@
|
|||||||
, libdbi ? null
|
, libdbi ? null
|
||||||
, libgcrypt ? null
|
, libgcrypt ? null
|
||||||
, libmemcached ? null, cyrus_sasl ? null
|
, libmemcached ? null, cyrus_sasl ? null
|
||||||
|
, libmicrohttpd ? null
|
||||||
, libmodbus ? null
|
, libmodbus ? null
|
||||||
, libnotify ? null, gdk_pixbuf ? null
|
, libnotify ? null, gdk_pixbuf ? null
|
||||||
, liboping ? null
|
, liboping ? null
|
||||||
@ -34,24 +35,19 @@
|
|||||||
, libmnl ? null
|
, libmnl ? null
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "5.6.0";
|
version = "5.7.0";
|
||||||
name = "collectd-${version}";
|
name = "collectd-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://collectd.org/files/${name}.tar.bz2";
|
url = "http://collectd.org/files/${name}.tar.bz2";
|
||||||
sha256 = "08w6fjzczi2psk7va0xkjh9pigpar6sbjx2a6ayq4dmc3zcvpzzh";
|
sha256 = "1cpjkv4d0iifngihxikzljavya0r2k3blarlahamgbdsqsymz815";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
pkgconfig curl iptables libatasmart libcredis libdbi libgcrypt libmemcached
|
pkgconfig curl iptables libatasmart libcredis libdbi libgcrypt libmemcached
|
||||||
cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt
|
cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt
|
||||||
lm_sensors libxml2 lvm2 libmysql postgresql protobufc rabbitmq-c rrdtool
|
lm_sensors libxml2 lvm2 libmysql postgresql protobufc rabbitmq-c rrdtool
|
||||||
varnish yajl jdk libtool python udev net_snmp hiredis libmnl
|
varnish yajl jdk libtool python udev net_snmp hiredis libmnl libmicrohttpd
|
||||||
];
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Replace deprecated readdir_r() with readdir() to avoid a fatal warning.
|
|
||||||
./readdir-fix.patch
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# for some reason libsigrok isn't auto-detected
|
# for some reason libsigrok isn't auto-detected
|
||||||
|
@ -1,55 +0,0 @@
|
|||||||
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] == '.')
|
|
@ -11091,7 +11091,9 @@ in
|
|||||||
inherit (perlPackages) SGMLSpm;
|
inherit (perlPackages) SGMLSpm;
|
||||||
};
|
};
|
||||||
|
|
||||||
iptables = callPackage ../os-specific/linux/iptables { };
|
iptables = callPackage ../os-specific/linux/iptables {
|
||||||
|
flex = flex_2_5_35;
|
||||||
|
};
|
||||||
|
|
||||||
ipset = callPackage ../os-specific/linux/ipset { };
|
ipset = callPackage ../os-specific/linux/ipset { };
|
||||||
|
|
||||||
|
@ -28779,13 +28779,13 @@ EOF
|
|||||||
};
|
};
|
||||||
|
|
||||||
libvirt = let
|
libvirt = let
|
||||||
version = "2.5.0";
|
version = "3.0.0";
|
||||||
in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec {
|
in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec {
|
||||||
name = "libvirt-python-${version}";
|
name = "libvirt-python-${version}";
|
||||||
|
|
||||||
src = pkgs.fetchurl {
|
src = pkgs.fetchurl {
|
||||||
url = "http://libvirt.org/sources/python/${name}.tar.gz";
|
url = "http://libvirt.org/sources/python/${name}.tar.gz";
|
||||||
sha256 = "1lanyrk4invs5j4jrd7yvy7g8kilihjbcrgs5arx8k3bs9x7izgl";
|
sha256 = "1ha4bqf029si1lla1z7ca786w571fh3wfs4h7zaglfk4gb2w39wl";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ];
|
buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user