diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-07-12 20:13:22 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-07-12 22:00:10 +0200 |
commit | 40785f0dac55be9bffa029498d20539e567822be (patch) | |
tree | c126c0271b8644830e16cd0c1a5d906d520fed65 /pkgs/tools/networking | |
parent | ba2eec97b5022848fffeb8c85303b7afe4690e82 (diff) | |
parent | 9aa3e78ab206556754186cc2b88aea5009af0f7c (diff) | |
download | nixlib-40785f0dac55be9bffa029498d20539e567822be.tar nixlib-40785f0dac55be9bffa029498d20539e567822be.tar.gz nixlib-40785f0dac55be9bffa029498d20539e567822be.tar.bz2 nixlib-40785f0dac55be9bffa029498d20539e567822be.tar.lz nixlib-40785f0dac55be9bffa029498d20539e567822be.tar.xz nixlib-40785f0dac55be9bffa029498d20539e567822be.tar.zst nixlib-40785f0dac55be9bffa029498d20539e567822be.zip |
Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1282763
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/dnsmasq/default.nix | 13 | ||||
-rw-r--r-- | pkgs/tools/networking/haproxy/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/mu/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/ntp/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/p2p/gtk-gnutella/default.nix | 16 | ||||
-rw-r--r-- | pkgs/tools/networking/shadowsocks-libev/default.nix | 14 | ||||
-rw-r--r-- | pkgs/tools/networking/siege/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/srelay/arm.patch | 12 | ||||
-rw-r--r-- | pkgs/tools/networking/srelay/default.nix | 21 | ||||
-rw-r--r-- | pkgs/tools/networking/urlwatch/default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/networking/urlwatch/setup.patch | 42 |
11 files changed, 111 insertions, 34 deletions
diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 63720faf7078..6b47e0cae840 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -11,11 +11,11 @@ let ]); in stdenv.mkDerivation rec { - name = "dnsmasq-2.75"; + name = "dnsmasq-2.76"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz"; - sha256 = "1wa1d4if9q6k3hklv8xi06a59k3aqb7pik8rhi2l53i99hflw334"; + sha256 = "15lzih6671gh9knzpl8mxchiml7z5lfqzr7jm2r0rjhrxs6nk4jb"; }; preBuild = '' @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; postBuild = optionalString stdenv.isLinux '' - make -C contrib/wrt + make -C contrib/lease-tools ''; # XXX: Does the systemd service definition really belong here when our NixOS @@ -39,8 +39,9 @@ stdenv.mkDerivation rec { install -Dm644 trust-anchors.conf $out/share/dnsmasq/trust-anchors.conf '' + optionalString stdenv.isLinux '' install -Dm644 dbus/dnsmasq.conf $out/etc/dbus-1/system.d/dnsmasq.conf - install -Dm755 contrib/wrt/dhcp_lease_time $out/bin/dhcp_lease_time - install -Dm755 contrib/wrt/dhcp_release $out/bin/dhcp_release + install -Dm755 contrib/lease-tools/dhcp_lease_time $out/bin/dhcp_lease_time + install -Dm755 contrib/lease-tools/dhcp_release $out/bin/dhcp_release + install -Dm755 contrib/lease-tools/dhcp_release6 $out/bin/dhcp_release6 mkdir -p $out/share/dbus-1/system-services cat <<END > $out/share/dbus-1/system-services/uk.org.thekelleys.dnsmasq.service @@ -61,6 +62,6 @@ stdenv.mkDerivation rec { homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html; license = licenses.gpl2; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ eelco ]; + maintainers = with maintainers; [ eelco fpletz ]; }; } diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 3f853ca303ec..8a15811407dd 100644 --- a/pkgs/tools/networking/haproxy/default.nix +++ b/pkgs/tools/networking/haproxy/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { majorVersion = "1.6"; - version = "${majorVersion}.5"; + version = "${majorVersion}.6"; name = "haproxy-${version}"; src = fetchurl { url = "http://haproxy.1wt.eu/download/${majorVersion}/src/${name}.tar.gz"; - sha256 = "1pl5zsn12jjfss3cxzbqmxih4nf2gh8qf83qaayvpavli29zpcy4"; + sha256 = "1xamzzfvwgh3b72f3j74ar9xcn61viszqfbdpf4cdhwc0xikvc7x"; }; buildInputs = [ openssl zlib ]; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 5829dc9d5509..fa1740e9d124 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, sqlite, pkgconfig, autoreconfHook , xapian, glib, gmime, texinfo , emacs, guile -, gtk3, webkit, libsoup, icu, withMug ? false /* doesn't build with current gtk3 */ }: +, gtk3, webkitgtk24x, libsoup, icu }: stdenv.mkDerivation rec { version = "0.9.16"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite pkgconfig xapian glib gmime texinfo emacs guile libsoup icu autoreconfHook - ] ++ stdenv.lib.optionals withMug [ gtk3 webkit ]; + gtk3 webkitgtk24x ]; preBuild = '' # Fix mu4e-builddir (set it to $out) @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; # Install mug and msg2pdf - postInstall = stdenv.lib.optionalString withMug '' + postInstall = '' cp -v toys/msg2pdf/msg2pdf $out/bin/ cp -v toys/mug/mug $out/bin/ ''; diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 0e7c23fd3a6c..433a3349702d 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -3,11 +3,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { - name = "ntp-4.2.8p6"; + name = "ntp-4.2.8p8"; src = fetchurl { url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; - sha256 = "0j509gd0snj8dq15rhfv2v4wisfaabya1gmgqslk1kisawf0wgaq"; + sha256 = "1vlpgd0dk2wkpmmf869sfxi8f46sfnmjgk51vl8n6vj5y2sx1cra"; }; configureFlags = [ diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index ec2821f4d818..7d48f38e79d8 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -1,30 +1,26 @@ { stdenv, fetchurl, bison, pkgconfig -, glib, gtk, libxml2, gettext, zlib }: +, glib, gtk, libxml2, gettext, zlib, binutils, gnutls }: let name = "gtk-gnutella"; - version = "1.1.5"; + version = "1.1.9"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2"; - sha256 = "19d8mmyxrdwdafcjq1hvs9zn40yrcj1127163a2058svi0x08cn3"; + sha256 = "1zvadgsskmpm82id9mbj24a2lyq38qv768ixv7nmfjl3d4wr2biv"; }; - nativeBuildInputs = [ bison pkgconfig ]; - buildInputs = [ glib gtk libxml2 gettext zlib ]; + nativeBuildInputs = [ bison binutils gettext pkgconfig ]; + buildInputs = [ glib gnutls gtk libxml2 zlib ]; - NIX_LDFLAGS = "-rpath ${zlib.out}/lib"; - configureScript = "./Configure"; - dontAddPrefix = true; - configureFlags = "-d -e -D prefix=$out -D gtkversion=2 -D official=true"; + configureScript = "./build.sh --configure-only"; meta = with stdenv.lib; { homepage = http://gtk-gnutella.sourceforge.net/; description = "Server/client for Gnutella"; license = licenses.gpl2; - broken = true; }; } diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index e12d25930210..eb30ba2368a8 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -1,8 +1,8 @@ -{ withPolarSSL ? false +{ withMbedTLS ? true , enableSystemSharedLib ? true , stdenv, fetchurl, zlib , openssl ? null -, polarssl ? null +, mbedtls ? null , libev ? null , libsodium ? null , udns ? null @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { }; buildInputs = [ zlib ] - ++ optional (!withPolarSSL) openssl - ++ optional withPolarSSL polarssl + ++ optional (!withMbedTLS) openssl + ++ optional withMbedTLS mbedtls ++ optional enableSystemSharedLib [libev libsodium udns]; - configureFlags = optional withPolarSSL - [ "--with-crypto-library=polarssl" - "--with-polarssl=${polarssl}" + configureFlags = optional withMbedTLS + [ "--with-crypto-library=mbedtls" + "--with-mbedtls=${mbedtls}" ] ++ optional enableSystemSharedLib "--enable-system-shared-lib"; diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index c4d68ee399a1..c188dd477fe1 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, zlib }: stdenv.mkDerivation rec { - name = "siege-4.0.1"; + name = "siege-4.0.2"; src = fetchurl { url = "http://download.joedog.org/siege/${name}.tar.gz"; - sha256 = "0dr8k64s7zlhy3w8n1br0h6xd06p09p9809l9rp13isf10jp5pgx"; + sha256 = "0ivc6ah9n2888qgh8dicszhr3mjs42538lfx7dlhxvvvakwq3yvy"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/tools/networking/srelay/arm.patch b/pkgs/tools/networking/srelay/arm.patch new file mode 100644 index 000000000000..f56f2c0f2f0a --- /dev/null +++ b/pkgs/tools/networking/srelay/arm.patch @@ -0,0 +1,12 @@ +diff -ru srelay-0.4.8b4.orig/configure srelay-0.4.8b4/configure +--- srelay-0.4.8b4.orig/configure 2010-12-21 01:11:14.000000000 +1100 ++++ srelay-0.4.8b4/configure 2016-06-22 09:03:42.250000345 +1000 +@@ -1875,7 +1875,7 @@ + ;; + linux*) + case "$host_cpu" in +- i*86|mips*|powerpc*|sparc*|x86_64*) ++ i*86|mips*|powerpc*|sparc*|x86_64*|arm*) + OS=LINUX + cat >>confdefs.h <<\_ACEOF + #define LINUX 1 diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/tools/networking/srelay/default.nix new file mode 100644 index 000000000000..853a21da73c4 --- /dev/null +++ b/pkgs/tools/networking/srelay/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, openssl }: + +stdenv.mkDerivation rec { + name = "srelay-0.4.8b6"; + + src = fetchurl { + url = "https://sourceforge.net/projects/socks-relay/files/socks-relay/srelay-0.4.8/srelay-0.4.8b6.tar.gz"; + sha256 = "1az9ds10hpmpw6bqk7fcd1w70001kz0mm48v3vgg2z6vrbmgn0qj"; + }; + + patches = [ ./arm.patch ]; + + installPhase = "install -D srelay $out/bin/srelay"; + + meta = { + description = "A SOCKS proxy and relay"; + homepage = http://socks-relay.sourceforge.net/; + platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 67b53c83448f..3634b852fadc 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -1,14 +1,19 @@ { stdenv, fetchurl, python3Packages }: python3Packages.buildPythonApplication rec { - name = "urlwatch-2.1"; + name = "urlwatch-2.2"; src = fetchurl { url = "http://thp.io/2008/urlwatch/${name}.tar.gz"; - sha256 = "0xn435cml9wjwk39117p1diqmvw3jbmv9ccr7230iaf7z59vf9v6"; + sha256 = "0s9056mm1hkj5gpzsb5bz6fwxk0nm73i0dhnqwa1bfddjnvpl9d3"; }; + patches = [ + ./setup.patch + ]; + propagatedBuildInputs = with python3Packages; [ + keyring minidb pyyaml requests2 diff --git a/pkgs/tools/networking/urlwatch/setup.patch b/pkgs/tools/networking/urlwatch/setup.patch new file mode 100644 index 000000000000..66626dbf0259 --- /dev/null +++ b/pkgs/tools/networking/urlwatch/setup.patch @@ -0,0 +1,42 @@ +From ebe7b90100a3d960f53fdc9409d2d89eaa61bf11 Mon Sep 17 00:00:00 2001 +From: Thomas Perl <m@thp.io> +Date: Tue, 28 Jun 2016 18:15:51 +0200 +Subject: [PATCH] Check current directory and use os.path.relpath (Fixes #73) + +--- + setup.py | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/setup.py b/setup.py +index 947a7c8..45405cd 100644 +--- a/setup.py ++++ b/setup.py +@@ -7,10 +7,15 @@ + + import os + import re ++import sys + + PACKAGE_NAME = 'urlwatch' + DEPENDENCIES = ['minidb', 'PyYAML', 'requests'] +-HERE = os.path.dirname(__file__) ++HERE = os.path.abspath(os.path.dirname(__file__)) ++ ++if os.path.normpath(os.getcwd()) != os.path.normpath(HERE): ++ print('You must run {} inside {} (cwd={})'.format(os.path.basename(__file__), HERE, os.getcwd())) ++ sys.exit(1) + + # Assumptions: + # 1. Package name equals main script file name (and only one script) +@@ -29,9 +34,9 @@ + + m['scripts'] = [os.path.join(HERE, PACKAGE_NAME)] + m['package_dir'] = {'': os.path.join(HERE, 'lib')} +-m['packages'] = ['.'.join(dirname[len(HERE)+1:].split(os.sep)[1:]) ++m['packages'] = ['.'.join(os.path.relpath(dirname, HERE).split(os.sep)[1:]) + for dirname, _, files in os.walk(os.path.join(HERE, 'lib')) if '__init__.py' in files] +-m['data_files'] = [(dirname[len(HERE)+1:], [os.path.join(dirname[len(HERE)+1:], fn) for fn in files]) ++m['data_files'] = [(os.path.relpath(dirname, HERE), [os.path.join(os.path.relpath(dirname, HERE), fn) for fn in files]) + for dirname, _, files in os.walk(os.path.join(HERE, 'share')) if files] + m['install_requires'] = DEPENDENCIES + |