diff options
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/djbdns/default.nix | 48 | ||||
-rw-r--r-- | pkgs/tools/networking/djbdns/hier.patch | 15 | ||||
-rw-r--r-- | pkgs/tools/networking/kea/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/network-manager-applet/default.nix | 20 | ||||
-rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 23 | ||||
-rw-r--r-- | pkgs/tools/networking/network-manager/openvpn.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/openconnect/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/networking/unbound/default.nix | 4 |
8 files changed, 94 insertions, 32 deletions
diff --git a/pkgs/tools/networking/djbdns/default.nix b/pkgs/tools/networking/djbdns/default.nix new file mode 100644 index 000000000000..7537ab1c47ac --- /dev/null +++ b/pkgs/tools/networking/djbdns/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, glibc } : + +let + version = "1.05"; + + manSrc = fetchurl { + url = "http://smarden.org/pape/djb/manpages/djbdns-${version}-man-20031023.tar.gz"; + sha256 = "0sg51gjy6j1hnrra406q1qhf5kvk1m00y8qqhs6r0a699gqmh75s"; + }; + +in + +stdenv.mkDerivation { + name = "djbdns-${version}"; + + src = fetchurl { + url = "https://cr.yp.to/djbdns/djbdns-${version}.tar.gz"; + sha256 = "0j3baf92vkczr5fxww7rp1b7gmczxmmgrqc8w2dy7kgk09m85k9w"; + }; + + patches = [ ./hier.patch ]; + + postPatch = '' + echo gcc -O2 -include ${glibc.dev}/include/errno.h > conf-cc + echo $out > conf-home + sed -i "s|/etc/dnsroots.global|$out/etc/dnsroots.global|" dnscache-conf.c + ''; + + installPhase = '' + mkdir -pv $out/etc; + make setup + cd $out; + tar xzvf ${manSrc}; + for n in 1 5 8; do + mkdir -p man/man$n; + mv -iv djbdns-man/*.$n man/man$n; + done; + rm -rv djbdns-man; + ''; + + meta = with stdenv.lib; { + description = "A collection of Domain Name System tools"; + longDescription = "Includes software for all the fundamental DNS operations: DNS cache: finding addresses of Internet hosts; DNS server: publishing addresses of Internet hosts; and DNS client: talking to a DNS cache."; + homepage = https://cr.yp.to/djbdns.html; + license = licenses.publicDomain; + maintainers = with maintainers; [ jerith666 ]; + }; +} \ No newline at end of file diff --git a/pkgs/tools/networking/djbdns/hier.patch b/pkgs/tools/networking/djbdns/hier.patch new file mode 100644 index 000000000000..7fddd1213834 --- /dev/null +++ b/pkgs/tools/networking/djbdns/hier.patch @@ -0,0 +1,15 @@ +--- a/hier.c 2016-04-19 21:22:21.992192405 -0400 ++++ b/hier.c 2016-04-19 21:22:33.160229778 -0400 +@@ -2,9 +2,9 @@ + + void hier() + { +- c("/","etc","dnsroots.global",-1,-1,0644); ++ c(auto_home,"etc","dnsroots.global",-1,-1,0644); + +- h(auto_home,-1,-1,02755); +- d(auto_home,"bin",-1,-1,02755); ++ h(auto_home,-1,-1,0755); ++ d(auto_home,"bin",-1,-1,0755); + + c(auto_home,"bin","dnscache-conf",-1,-1,0755); diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index e1829bcaf7d8..cd4c45121692 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--with-botan-config=${botan}/bin/botan-config-1.10" - "--with-dhcp-pgsql=${postgresql}/bin/pg_config" + "--with-dhcp-pgsql=${postgresql.dev}/bin/pg_config" "--with-dhcp-mysql=${mysql.client.dev}/bin/mysql_config" ]; diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index c596ea63f4d3..3220aebdfe49 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,26 +1,32 @@ { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3 , libnotify, libsecret, polkit, isocodes, modemmanager, librsvg , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas -, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk }: +, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson, wrapGAppsHook, webkitgtk +, withGnome ? false }: stdenv.mkDerivation rec { name = "${pname}-${major}.${minor}"; pname = "network-manager-applet"; - major = "1.4"; - minor = "6"; + major = "1.8"; + minor = "2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz"; - sha256 = "0xpcdwqmnwiqqqsd5rx1gh5rvv5m2skj59bqxhccy1k2ikzgr9hh"; + sha256 = "09f9hjpn9nkhw57mk6pi7q1bq3lhf5hvmwas0fknscssak7yjmry"; }; - configureFlags = [ "--sysconfdir=/etc" ]; + configureFlags = [ + "--sysconfdir=/etc" + "--without-selinux" + ]; + + outputs = [ "out" "dev" ]; buildInputs = [ gnome3.gtk libglade networkmanager libnotify libsecret gsettings_desktop_schemas polkit isocodes makeWrapper udev libgudev gnome3.gconf gnome3.libgnome_keyring - modemmanager jansson librsvg glib_networking gnome3.dconf webkitgtk - ]; + modemmanager jansson librsvg glib_networking gnome3.dconf + ] ++ stdenv.lib.optional withGnome webkitgtk; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index d2a51b3acc86..ace568d6900b 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -3,19 +3,17 @@ , libgcrypt, dnsmasq, bluez5, readline , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup , ethtool, iputils, gnused, coreutils, file, inetutils, kmod, jansson, libxslt -, python3Packages, docbook_xsl, fetchpatch, openconnect }: +, python3Packages, docbook_xsl, fetchpatch, openconnect, curl, autoreconfHook }: stdenv.mkDerivation rec { name = "network-manager-${version}"; pname = "NetworkManager"; - major = "1.6"; + major = "1.8"; version = "${major}.2"; - # FIXME: this problem is fixed upstream (commit 6a77258f4ec2), remove when upgrading ^^^ - hardeningDisable = [ "format" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; - sha256 = "1y96k82rav8if334jl500zc024d210c4pgprh94yqyz3rmanyaxj"; + sha256 = "1x0vzxvrck0snga2n3pc7g74m20zz74cr4r8gfspl8sckv6yz9bi"; }; outputs = [ "out" "dev" ]; @@ -46,13 +44,15 @@ stdenv.mkDerivation rec { --subst-var-by modprobeBinPath ${kmod}/bin/modprobe # to enable link-local connections configureFlags="$configureFlags --with-udev-dir=$out/lib/udev" + + # Fixes: error: po/Makefile.in.in was not created by intltoolize. + intltoolize --automake --copy --force ''; # Right now we hardcode quite a few paths at build time. Probably we should # patch networkmanager to allow passing these path in config file. This will # remove unneeded build-time dependencies. configureFlags = [ - "--with-distro=exherbo" "--with-dhclient=${dhcp}/bin/dhclient" "--with-dnsmasq=${dnsmasq}/bin/dnsmasq" # Upstream prefers dhclient, so don't add dhcpcd to the closure @@ -69,26 +69,21 @@ stdenv.mkDerivation rec { "--with-session-tracking=systemd" "--with-modem-manager-1" "--with-nmtui" - "--with-libsoup=yes" + "--disable-gtk-doc" ]; patches = [ ./PppdPath.patch - (fetchpatch { - sha256 = "1n90j5rwg97xkrhlldyr92filc2dmycl9pr0svky9hlcn9csk2z6"; - name = "null-dereference.patch"; - url = "https://github.com/NetworkManager/NetworkManager/commit/4e8eddd100bbc8429806a70620c90b72cfd29cb1.patch"; - }) ./openconnect_helper_path.patch ./modprobe.patch ]; - buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp + buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp curl bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup jansson ]; propagatedBuildInputs = [ dbus_glib gnutls libgcrypt python3Packages.pygobject3 ]; - nativeBuildInputs = [ intltool pkgconfig libxslt docbook_xsl ]; + nativeBuildInputs = [ autoreconfHook intltool pkgconfig libxslt docbook_xsl ]; preInstall = '' installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" "runstatedir=$out/var/run" ) diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index 3edbe7dba6ed..47dca561d6cb 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-openvpn"; - major = "1.2"; - version = "${major}.8"; + major = "1.8"; + version = "${major}.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; - sha256 = "0m06sg2rnz764psvpsrx0pvll11nfn9hypgbp3s6vna8y83l02ry"; + sha256 = "1973n89g66a3jfx8r45a811fga4kadh6r1w35cb25cz1mlii2vhn"; }; buildInputs = [ openvpn networkmanager libsecret ] diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index 5e38aee7f833..4fccb107771a 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -1,10 +1,6 @@ { stdenv, fetchurl, pkgconfig, vpnc, openssl ? null, gnutls ? null, gmp, libxml2, stoken, zlib } : -let - xor = a: b: (a || b) && (!(a && b)); -in - -assert xor (openssl != null) (gnutls != null); +assert (openssl != null) == (gnutls == null); stdenv.mkDerivation rec { name = "openconnect-7.08"; @@ -16,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "00wacb79l2c45f94gxs63b9z25wlciarasvjrb8jb8566wgyqi0w"; }; + outputs = [ "out" "dev" ]; + preConfigure = '' export PKG_CONFIG=${pkgconfig}/bin/pkg-config export LIBXML2_CFLAGS="-I ${libxml2.dev}/include/libxml2" diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index a65ccb0541c8..cb462a2cedd2 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unbound-${version}"; - version = "1.6.5"; + version = "1.6.6"; src = fetchurl { url = "http://unbound.net/downloads/${name}.tar.gz"; - sha256 = "0khhrj11yhh6a0h578w29yw2j7yzvaqkr4p44jzjapq1549am5z2"; + sha256 = "145kska9a63yf32y3jg91y5ikcmsb7qvbcm7a8k6fgh96gf18awp"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB |