diff options
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/junkie/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/kea/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/mailutils/default.nix | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/tools/networking/junkie/default.nix b/pkgs/tools/networking/junkie/default.nix index 9f7b4350f1b13..87c0fc6ae2a79 100644 --- a/pkgs/tools/networking/junkie/default.nix +++ b/pkgs/tools/networking/junkie/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libpcap, guile, openssl }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, libpcap, guile_2_2, openssl }: stdenv.mkDerivation rec { pname = "junkie"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { sed -i '10i#undef IP_DONTFRAG' include/junkie/proto/ip.h ''; - buildInputs = [ libpcap guile openssl ]; + buildInputs = [ libpcap guile_2_2 openssl ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; configureFlags = [ "GUILELIBDIR=\${out}/share/guile/site" diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 9ee9a3df0f75d..2c5b064a165f2 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -80,6 +80,8 @@ stdenv.mkDerivation rec { kea = nixosTests.kea; prefix-delegation = nixosTests.systemd-networkd-ipv6-prefix-delegation; prometheus-exporter = nixosTests.prometheus-exporters.kea; + networking-scripted = lib.recurseIntoAttrs { inherit (nixosTests.networking.scripted) dhcpDefault dhcpSimple dhcpOneIf; }; + networking-networkd = lib.recurseIntoAttrs { inherit (nixosTests.networking.networkd) dhcpDefault dhcpSimple dhcpOneIf; }; }; meta = with lib; { diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 6ed8b2fc4b5b1..2fa7f78f4937e 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -12,7 +12,7 @@ , gdbm , gnutls , gss -, guile +, guile_2_2 , libmysqlclient , mailcap , nettools @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { libxcrypt ] ++ lib.optionals stdenv.isLinux [ nettools ] ++ lib.optionals pythonSupport [ python3 ] - ++ lib.optionals guileSupport [ guile ]; + ++ lib.optionals guileSupport [ guile_2_2 ]; patches = [ ./fix-build-mb-len-max.patch |