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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2016-02-17 10:06:31 +01:00
parent ee994dfae6 2f3eae3a87
commit e9520e81b3
456 changed files with 22536 additions and 2438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/networking/babeld/default.nix
View File

@@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "babeld-1.6.1";
name = "babeld-1.7.1";
src = fetchurl {
url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz";
sha256 = "1d45f12mhlxsf8jlpgb1gig5bjg5izdkfk173rd9a1wi7s82pisl";
sha256 = "1dl7s2lb40kiysrqhr7zd0s90yfxy6xfsp0fhqgdlwfr99ymx59c";
};
preBuild = ''
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/babel/";
description = "Loop-avoiding distance-vector routing protocol";
license = stdenv.lib.licenses.mit;
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
maintainers = with stdenv.lib.maintainers; [ fuuzetsu fpletz ];
};
}

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

@@ -1,12 +1,13 @@
{ stdenv, fetchgit, qtbase, makeWrapper, libX11 }:
{ stdenv, fetchFromGitHub, qtbase, makeWrapper, libX11 }:
stdenv.mkDerivation rec {
name = "cmst-2014.12.05";
rev = "refs/tags/${name}";
src = fetchgit {
url = "git://github.com/andrew-bibb/cmst.git";
inherit rev;
sha256 = "070rxv3kyn41ra7nnk1wbqvy6fjg38h7hrdv4dn71b201kmzd194";
name = "cmst-2016.01.28";
src = fetchFromGitHub {
sha256 = "1zf4jnrnbi05mrq1fnsji5zx60h1knrkr64pwcz2c7q8p59k4646";
rev = name;
repo = "cmst";
owner = "andrew-bibb";
};
buildInputs = [ qtbase makeWrapper ];
@@ -27,7 +28,6 @@ stdenv.mkDerivation rec {
substituteInPlace ./apps/rootapp/rootapp.pro \
--replace "/etc" "$out/etc" \
--replace "/usr/share" "$out/share"
'';
buildPhase = ''

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

@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "connman-${version}";
version = "1.30";
version = "1.31";
src = fetchgit {
url = "git://git.kernel.org/pub/scm/network/connman/connman.git";
rev = "refs/tags/${version}";
sha256 = "715474351e22b52334d37c146fd5eb87d692be8501d8dac33a0e330437235295";
sha256 = "90dab6b11841cb4b6400711d234b59fb4fad4e8778bed6e7ad3ac7ac135d6893";
};
buildInputs = [ autoconf automake libtool pkgconfig openconnect polkit

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

@@ -1,13 +1,13 @@
{ stdenv, fetchurl, buildPythonPackage }:
buildPythonPackage rec {
version = "4.48.0";
version = "4.49.0";
name = "getmail-${version}";
namePrefix = "";
src = fetchurl {
url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz";
sha256 = "0k5rm5kag14izng2ajcagvli9sns5mzvkyfa65ri4xymxs91wi29";
sha256 = "1m0yzxd05fklwbmjj1n2q4sx397c1j5qi9a0r5fv3h8pplz4lv0w";
};
doCheck = false;

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

@@ -4,13 +4,13 @@ stdenv.mkDerivation rec {
name = pname + "-" + version;
pname = "i2pd";
version = "2.3.0";
version = "2.4.0";
src = fetchFromGitHub {
owner = "PurpleI2P";
repo = pname;
rev = version;
sha256 = "0gb6bdsyb7m0jkilln9h7z2l8gr8ia10jah17ygc15jzycygijis";
sha256 = "1nkf3dplvyg2lgygd3jd4bqh5s4nm6ppyks3a05a1dcbwm8ws42y";
};
buildInputs = [ boost zlib openssl ];

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

@@ -1,21 +1,19 @@
{ stdenv, fetchurl, iptables, pkgconfig }:
{ stdenv, fetchurl, iptables, libuuid, pkgconfig }:
assert stdenv.isLinux;
stdenv.mkDerivation rec {
name = "miniupnpd-1.9.20160113";
name = "miniupnpd-1.9.20160212";
src = fetchurl {
url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
sha256 = "084ii5vb54rr8sg50cqvsw5rj6linj23p3gnxwfyl100dkkgvcaa";
sha256 = "1fsl46f7lrhpb597m0a905nwijpf188cchgg6pz39fx2mgjjjk9l";
name = "${name}.tar.gz";
};
buildInputs = [ iptables ];
buildInputs = [ iptables libuuid ];
nativeBuildInputs= [ pkgconfig ];
NIX_CFLAGS_LINK = "-liptc";
makefile = "Makefile.linux";
buildFlags = "miniupnpd genuuid";

2
pkgs/tools/networking/nethogs/default.nix
View File

@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
homepage = http://nethogs.sourceforge.net/;
platforms = platforms.linux;
maintainer = [ maintainers.rycee ];
maintainers = [ maintainers.rycee ];
};
}

26
pkgs/tools/networking/p2p/tahoe-lafs/default.nix
View File

@@ -1,19 +1,18 @@
{ fetchurl, lib, unzip, buildPythonPackage, twisted, foolscap, nevow
, simplejson, zfec, pycryptopp, sqlite3, darcsver, setuptoolsTrial, python
, setuptoolsDarcs, numpy, nettools, pycrypto, pyasn1, mock, zope_interface }:
{ fetchurl, lib, unzip, nettools, pythonPackages }:
# FAILURES: The "running build_ext" phase fails to compile Twisted
# plugins, because it tries to write them into Twisted's (immutable)
# store path. The problem appears to be non-fatal, but there's probably
# some loss of functionality because of it.
buildPythonPackage rec {
name = "tahoe-lafs-1.10.0";
pythonPackages.buildPythonPackage rec {
version = "1.10.2";
name = "tahoe-lafs-${version}";
namePrefix = "";
src = fetchurl {
url = "http://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-1.10.0.tar.bz2";
sha256 = "1qng7j1vykk8zl5da9yklkljvgxfnjky58gcay6dypz91xq1cmcw";
url = "http://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-${version}.tar.bz2";
sha256 = "1rvv0ik5biy7ji8pg56v0qycnggzr3k6dbg88n555nb6r4cxgmgy";
};
patchPhase = ''
@@ -32,13 +31,14 @@ buildPythonPackage rec {
'';
# Some tests want this + http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-dep-sdists/mock-0.6.0.tar.bz2
buildInputs = [ unzip numpy ];
buildInputs = with pythonPackages; [ unzip numpy mock ];
# The `backup' command requires `sqlite3'.
propagatedBuildInputs =
[ twisted foolscap nevow simplejson zfec pycryptopp sqlite3
darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface mock
];
propagatedBuildInputs = with pythonPackages; [
twisted foolscap nevow simplejson zfec pycryptopp sqlite3 darcsver
setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface
service-identity
];
postInstall = ''
# Install the documentation.
@@ -49,7 +49,7 @@ buildPythonPackage rec {
checkPhase = ''
# TODO: broken with wheels
#${python.interpreter} setup.py trial
#${pythonPackages.python.interpreter} setup.py trial
'';
meta = {

2
pkgs/tools/networking/pdnsd/default.nix
View File

@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
sed -i 's/.*(cachedir).*/:/' Makefile.in
'';
configureFlags = [ "--enable-ipv6" ];
meta = {
description = "Permanent DNS caching";
homepage = http://www.phys.uu.nl/~rombouts/pdnsd.html;

25
pkgs/tools/networking/sipsak/default.nix Normal file
View File

@@ -0,0 +1,25 @@
{ stdenv, fetchurl, autoreconfHook, c-ares, openssl ? null }:
stdenv.mkDerivation rec {
name = "sipsak-${version}";
version = "4.1.2.1";
buildInputs = [
autoreconfHook
openssl
c-ares
];
src = fetchurl {
url = "https://github.com/sipwise/sipsak/archive/mr${version}.tar.gz";
sha256 = "769fe59966b1962b67aa35aad7beb9a2110ebdface36558072a05c6405fb5374";
};
meta = with stdenv.lib; {
homepage = https://github.com/sipwise/sipsak;
description = "SIP Swiss army knife";
license = stdenv.lib.licenses.gpl2;
};
}

12
pkgs/tools/networking/unbound/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "unbound-${version}";
version = "1.5.3";
version = "1.5.7";
src = fetchurl {
url = "http://unbound.net/downloads/${name}.tar.gz";
sha256 = "1jly2apag4yg649w3flaq73wdrcfyxnhx5py9j73y7adxmswigbn";
sha256 = "1a0wfgp6wqpf7cxlcbprqhnjx6z9ywf0rhrpcf7x98l1mbjqh82b";
};
buildInputs = [ openssl expat libevent ];
@@ -17,15 +17,17 @@ stdenv.mkDerivation rec {
"--with-libevent=${libevent}"
"--localstatedir=/var"
"--sysconfdir=/etc"
"--enable-pie"
"--enable-relro-now"
];
installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ];
meta = {
meta = with stdenv.lib; {
description = "Validating, recursive, and caching DNS resolver";
license = stdenv.lib.licenses.bsd3;
license = licenses.bsd3;
homepage = http://www.unbound.net;
maintainers = [ stdenv.lib.maintainers.ehmry ];
maintainers = with maintainers; [ ehmry fpletz ];
platforms = stdenv.lib.platforms.unix;
};
}