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:
Frederik Rietdijk
2016-10-22 17:23:24 +02:00
parent bd12c10993 8c465c5201
commit e56832d730
221 changed files with 10778 additions and 4428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/networking/aria2/default.nix
View File

@@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
name = "aria2-${version}";
version = "1.27.1";
version = "1.28.0";
src = fetchFromGitHub {
owner = "aria2";
repo = "aria2";
rev = "release-${version}";
sha256 = "003m80gdcqfxi5jjzwiszql5y8lrj7a59gjygy0ya72fa9j4l9mi";
sha256 = "196prs98sxwwxiszw2m1kbcra7n7fxf758y5dcj2jkddrr37hdkw";
};
nativeBuildInputs = [ pkgconfig autoreconfHook ];

10
pkgs/tools/networking/cmst/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "cmst-${version}";
version = "2016.04.03";
version = "2016.10.03";
src = fetchFromGitHub {
repo = "cmst";
owner = "andrew-bibb";
rev = name;
sha256 = "1334ynhq1lxcfqln3bq17hy1awyfnn3zhzpsnymlyp0z3h4ydpp9";
sha256 = "1pvk1jg0fiw0j4f1wrnhgirgziliwa44sxfdmcq9ans4zbig4izh";
};
nativeBuildInputs = [ makeWrapper qmakeHook ];
@@ -19,16 +19,14 @@ stdenv.mkDerivation rec {
preConfigure = ''
substituteInPlace ./cmst.pro \
--replace "/usr/bin" "$out/bin" \
--replace "/usr/share" "$out/usr/share"
--replace "/usr/share" "$out/share"
substituteInPlace ./cmst.pri \
--replace "/usr/lib" "$out/lib" \
--replace "/usr/share" "$out/share"
substituteInPlace ./apps/cmstapp/cmstapp.pro \
--replace "/usr/bin" "$out/bin" \
--replace "/usr/share" "$out/share"
--replace "/usr/bin" "$out/bin"
substituteInPlace ./apps/rootapp/rootapp.pro \
--replace "/etc" "$out/etc" \

4
pkgs/tools/networking/httpie/default.nix
View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonApplication rec {
name = "httpie-0.9.3";
name = "httpie-0.9.6";
namePrefix = "";
src = fetchurl {
url = "mirror://pypi/h/httpie/${name}.tar.gz";
sha256 = "0jvzxr8r6cy6ipknkw95qf8rz69nqdv5nky87h1vcp5pf8mgza1h";
sha256 = "1cch5y0hr9qpfn9m4nw5796c2x7v3m1ni4psjm26ajsl8pw90jx6";
};
propagatedBuildInputs = with pythonPackages; [ pygments requests2 ];

3
pkgs/tools/networking/openssh/default.nix
View File

@@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
# See discussion in https://github.com/NixOS/nixpkgs/pull/16966
./dont_create_privsep_path.patch
./fix-CVE-2016-8858.patch
]
++ optional withGssapiPatches gssapiSrc;
@@ -92,7 +93,7 @@ stdenv.mkDerivation rec {
description = "An implementation of the SSH protocol";
license = stdenv.lib.licenses.bsd2;
platforms = platforms.unix;
maintainers = with maintainers; [ eelco ];
maintainers = with maintainers; [ eelco aneeshusa ];
broken = hpnSupport; # probably after 6.7 update
};
}

11
pkgs/tools/networking/openssh/fix-CVE-2016-8858.patch Normal file
View File

@@ -0,0 +1,11 @@
diff -u -r1.126 -r1.127
--- ssh/kex.c 2016/09/28 21:44:52 1.126
+++ ssh/kex.c 2016/10/10 19:28:48 1.127
@@ -461,6 +461,7 @@
if (kex == NULL)
return SSH_ERR_INVALID_ARGUMENT;
+ ssh_dispatch_set(ssh, SSH2_MSG_KEXINIT, NULL);
ptr = sshpkt_ptr(ssh, &dlen);
if ((r = sshbuf_put(kex->peer, ptr, dlen)) != 0)
return r;

7
pkgs/tools/networking/shadowsocks-libev/default.nix
View File

@@ -11,12 +11,13 @@
, docbook_xml_dtd_45
, docbook_xsl
, libxslt
, pcre
}:
let
version = "2.5.0";
sha256 = "6841e0efa1c01caef5a827f463ee304dc9e48fb4751cc9256316df5ab4490ae0";
version = "2.5.5";
sha256 = "46a72367b7301145906185f1e4136e39d6792d27643826e409ab708351b6d0dd";
in
@@ -29,7 +30,7 @@ stdenv.mkDerivation rec {
inherit sha256;
};
buildInputs = [ zlib asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt ]
buildInputs = [ zlib asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt pcre ]
++ optional (!withMbedTLS) openssl
++ optional withMbedTLS mbedtls
++ optionals enableSystemSharedLib [libev libsodium udns];

30
pkgs/tools/networking/ssldump/default.nix Normal file
View File

@@ -0,0 +1,30 @@
{ stdenv, fetchFromGitHub, openssl, libpcap }:
stdenv.mkDerivation rec {
name = "ssldump";
version = "0.9b3";
src = fetchFromGitHub {
owner = "adulau";
repo = "ssldump";
rev = "4529d03a50d39d3697c3e39a3d6f6c9b29448aa0";
sha256 = "0wwsamzxabfxcil5y2g4v2261vdspxlp12wz4xhji8607jbyjwr1";
};
buildInputs = [ libpcap openssl ];
prePatch = ''
sed -i -e 's|#include.*net/bpf.h|#include <pcap/bpf.h>|' \
base/pcap-snoop.c
'';
configureFlags = [ "--with-pcap-lib=${libpcap}/lib"
"--with-pcap-inc=${libpcap}/include"
"--with-openssl-lib=${openssl}/lib"
"--with-openssl-inc=${openssl}/include" ];
meta = {
description = "ssldump is an SSLv3/TLS network protocol analyzer";
homepage = http://ssldump.sourceforge.net;
license = "BSD-style";
maintainers = with stdenv.lib.maintainers; [ aycanirican ];
platforms = stdenv.lib.platforms.linux;
};
}

110
pkgs/tools/networking/statsd/node-packages.nix
View File

@@ -8,7 +8,7 @@
version = "1.3.1";
bin = false;
src = fetchurl {
url = "http://registry.npmjs.org/commander/-/commander-1.3.1.tgz";
url = "https://registry.npmjs.org/commander/-/commander-1.3.1.tgz";
name = "commander-1.3.1.tgz";
sha1 = "02443e02db96f4b32b674225451abb6e9510000e";
};
@@ -28,7 +28,7 @@
version = "0.0.7";
bin = false;
src = fetchurl {
url = "http://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz";
url = "https://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz";
name = "connection-parse-0.0.7.tgz";
sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69";
};
@@ -40,16 +40,35 @@
os = [ ];
cpu = [ ];
};
by-spec."hashring"."1.0.1" =
self.by-version."hashring"."1.0.1";
by-version."hashring"."1.0.1" = self.buildNodePackage {
name = "hashring-1.0.1";
version = "1.0.1";
by-spec."generic-pool"."2.2.0" =
self.by-version."generic-pool"."2.2.0";
by-version."generic-pool"."2.2.0" = self.buildNodePackage {
name = "generic-pool-2.2.0";
version = "2.2.0";
bin = false;
src = fetchurl {
url = "http://registry.npmjs.org/hashring/-/hashring-1.0.1.tgz";
name = "hashring-1.0.1.tgz";
sha1 = "b6a7b8c675a0c715ac0d0071786eb241a28d0a7c";
url = "https://registry.npmjs.org/generic-pool/-/generic-pool-2.2.0.tgz";
name = "generic-pool-2.2.0.tgz";
sha1 = "8b465c1a7588ea9dd2bb133bda0bb66bfef8a63e";
};
deps = {
};
optionalDependencies = {
};
peerDependencies = [];
os = [ ];
cpu = [ ];
};
by-spec."hashring"."3.2.0" =
self.by-version."hashring"."3.2.0";
by-version."hashring"."3.2.0" = self.buildNodePackage {
name = "hashring-3.2.0";
version = "3.2.0";
bin = false;
src = fetchurl {
url = "https://registry.npmjs.org/hashring/-/hashring-3.2.0.tgz";
name = "hashring-3.2.0.tgz";
sha1 = "fda4efde8aa22cdb97fb1d2a65e88401e1c144ce";
};
deps = {
"connection-parse-0.0.7" = self.by-version."connection-parse"."0.0.7";
@@ -68,7 +87,7 @@
version = "0.1.0";
bin = false;
src = fetchurl {
url = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
name = "keypress-0.1.0.tgz";
sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a";
};
@@ -80,16 +99,36 @@
os = [ ];
cpu = [ ];
};
by-spec."node-syslog"."1.1.7" =
self.by-version."node-syslog"."1.1.7";
by-version."node-syslog"."1.1.7" = self.buildNodePackage {
name = "node-syslog-1.1.7";
version = "1.1.7";
by-spec."modern-syslog"."1.1.2" =
self.by-version."modern-syslog"."1.1.2";
by-version."modern-syslog"."1.1.2" = self.buildNodePackage {
name = "modern-syslog-1.1.2";
version = "1.1.2";
bin = false;
src = fetchurl {
url = "http://registry.npmjs.org/node-syslog/-/node-syslog-1.1.7.tgz";
name = "node-syslog-1.1.7.tgz";
sha1 = "f2b1dfce095c39f5a6d056659862ca134a08a4cb";
url = "https://registry.npmjs.org/modern-syslog/-/modern-syslog-1.1.2.tgz";
name = "modern-syslog-1.1.2.tgz";
sha1 = "f1fa58899f3f452d788f1573401212a4ef898de5";
};
deps = {
"nan-2.4.0" = self.by-version."nan"."2.4.0";
};
optionalDependencies = {
};
peerDependencies = [];
os = [ "!win32" ];
cpu = [ ];
};
by-spec."nan"."^2.0.5" =
self.by-version."nan"."2.4.0";
by-version."nan"."2.4.0" = self.buildNodePackage {
name = "nan-2.4.0";
version = "2.4.0";
bin = false;
src = fetchurl {
url = "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz";
name = "nan-2.4.0.tgz";
sha1 = "fb3c59d45fe4effe215f0b890f8adf6eb32d2232";
};
deps = {
};
@@ -106,7 +145,7 @@
version = "2.2.1";
bin = false;
src = fetchurl {
url = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
url = "https://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
name = "sequence-2.2.1.tgz";
sha1 = "7f5617895d44351c0a047e764467690490a16b03";
};
@@ -125,7 +164,7 @@
version = "0.0.2";
bin = false;
src = fetchurl {
url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz";
url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz";
name = "simple-lru-cache-0.0.2.tgz";
sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd";
};
@@ -144,7 +183,7 @@
version = "0.2.3";
bin = false;
src = fetchurl {
url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz";
url = "https://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz";
name = "stackdriver-statsd-backend-0.2.3.tgz";
sha1 = "6ffead71e5655d4d787c39da8d1c9eaaa59c91d7";
};
@@ -158,28 +197,29 @@
};
"stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.3";
by-spec."statsd"."*" =
self.by-version."statsd"."0.7.2";
by-version."statsd"."0.7.2" = self.buildNodePackage {
name = "statsd-0.7.2";
version = "0.7.2";
self.by-version."statsd"."0.8.0";
by-version."statsd"."0.8.0" = self.buildNodePackage {
name = "statsd-0.8.0";
version = "0.8.0";
bin = true;
src = fetchurl {
url = "http://registry.npmjs.org/statsd/-/statsd-0.7.2.tgz";
name = "statsd-0.7.2.tgz";
sha1 = "88901c5f30fa51da5fa3520468c94d7992ef576e";
url = "https://registry.npmjs.org/statsd/-/statsd-0.8.0.tgz";
name = "statsd-0.8.0.tgz";
sha1 = "92041479e174a214df7147f2fab1348af0839052";
};
deps = {
"generic-pool-2.2.0" = self.by-version."generic-pool"."2.2.0";
};
optionalDependencies = {
"node-syslog-1.1.7" = self.by-version."node-syslog"."1.1.7";
"hashring-1.0.1" = self.by-version."hashring"."1.0.1";
"modern-syslog-1.1.2" = self.by-version."modern-syslog"."1.1.2";
"hashring-3.2.0" = self.by-version."hashring"."3.2.0";
"winser-0.1.6" = self.by-version."winser"."0.1.6";
};
peerDependencies = [];
os = [ ];
cpu = [ ];
};
"statsd" = self.by-version."statsd"."0.7.2";
"statsd" = self.by-version."statsd"."0.8.0";
by-spec."statsd-influxdb-backend"."*" =
self.by-version."statsd-influxdb-backend"."0.6.0";
by-version."statsd-influxdb-backend"."0.6.0" = self.buildNodePackage {
@@ -187,7 +227,7 @@
version = "0.6.0";
bin = false;
src = fetchurl {
url = "http://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.6.0.tgz";
url = "https://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.6.0.tgz";
name = "statsd-influxdb-backend-0.6.0.tgz";
sha1 = "25fb83cf0b3af923dfc7d506eb1208def8790d78";
};
@@ -207,7 +247,7 @@
version = "0.1.7";
bin = false;
src = fetchurl {
url = "http://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.7.tgz";
url = "https://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.7.tgz";
name = "statsd-librato-backend-0.1.7.tgz";
sha1 = "270dc406481c0e6a6f4e72957681a73015f478f6";
};
@@ -227,7 +267,7 @@
version = "0.1.6";
bin = true;
src = fetchurl {
url = "http://registry.npmjs.org/winser/-/winser-0.1.6.tgz";
url = "https://registry.npmjs.org/winser/-/winser-0.1.6.tgz";
name = "winser-0.1.6.tgz";
sha1 = "08663dc32878a12bbce162d840da5097b48466c9";
};