summary refs log tree commit diff
path: root/pkgs/tools/networking
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2018-07-19 18:24:24 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2018-07-19 18:24:24 +0200
commit8213ff161c461655aaff7d43984384dbca64b312 (patch)
tree3b7c3138ff2222b9b6b8d247c3b1a0c8ea3305e3 /pkgs/tools/networking
parent9f208b5d8aa10518eb92ed5b7d77e4a588b5154c (diff)
parente7e5aaa0b938ed53dd96f58c8ebf9e0f7f72e133 (diff)
downloadnixlib-8213ff161c461655aaff7d43984384dbca64b312.tar
nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.gz
nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.bz2
nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.lz
nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.xz
nixlib-8213ff161c461655aaff7d43984384dbca64b312.tar.zst
nixlib-8213ff161c461655aaff7d43984384dbca64b312.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r--pkgs/tools/networking/dnsmasq/default.nix5
-rw-r--r--pkgs/tools/networking/offlineimap/default.nix4
-rw-r--r--pkgs/tools/networking/whois/default.nix4
3 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index ebbe5a11b523..be14db79880f 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, dbus_libs, nettle, libidn, libnetfilter_conntrack, fetchpatch }:
+{ stdenv, fetchurl, pkgconfig, dbus, nettle
+, libidn, libnetfilter_conntrack, fetchpatch }:
 
 with stdenv.lib;
 let
@@ -62,7 +63,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ nettle libidn ]
-    ++ optionals stdenv.isLinux [ dbus_libs libnetfilter_conntrack ];
+    ++ optionals stdenv.isLinux [ dbus libnetfilter_conntrack ];
 
   meta = {
     description = "An integrated DNS, DHCP and TFTP server for small networks";
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index c7d153186986..647b7ed26da9 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pythonPackages,
-  asciidoc, libxml2, libxslt, docbook_xml_xslt }:
+  asciidoc, libxml2, libxslt, docbook_xsl }:
 
 pythonPackages.buildPythonApplication rec {
   version = "7.2.1";
@@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec {
 
   doCheck = false;
 
-  nativeBuildInputs = [ asciidoc libxml2 libxslt docbook_xml_xslt ];
+  nativeBuildInputs = [ asciidoc libxml2 libxslt docbook_xsl ];
   propagatedBuildInputs = [ pythonPackages.six pythonPackages.kerberos ];
 
   postInstall = ''
diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index e644578b6642..b11d149da889 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }:
 
 stdenv.mkDerivation rec {
-  version = "5.3.1";
+  version = "5.3.2";
   name = "whois-${version}";
 
   src = fetchFromGitHub {
     owner = "rfc1036";
     repo = "whois";
     rev = "v${version}";
-    sha256 = "1xqvcsh70590bwmy37kwlwyl0rvnlqx987km3mnij93q4kvabg5n";
+    sha256 = "1sd6jl349kz3bjwm8rx9kihxyd3d35cac4swla843vwzdpczsk5f";
   };
 
   nativeBuildInputs = [ perl gettext pkgconfig ];