diff options
Diffstat (limited to 'pkgs/tools/networking')
5 files changed, 59 insertions, 31 deletions
diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index 6c4356d04fd4..64d61f0e323c 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -19,6 +19,7 @@ , vala , gobject-introspection , dbus +, bash }: stdenv.mkDerivation rec { @@ -39,6 +40,8 @@ stdenv.mkDerivation rec { ./no-dummy-dirs-in-sysconfdir.patch ]; + strictDeps = true; + nativeBuildInputs = [ meson ninja @@ -61,6 +64,7 @@ stdenv.mkDerivation rec { systemd bash-completion dbus + bash # shebangs in share/ModemManager/fcc-unlock.available.d/ ]; nativeInstallCheckInputs = [ diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 5490977df12d..c1e14dcfecb1 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -57,11 +57,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.44.2"; + version = "1.46.0"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-S1i/OsV+LO+1ZS79CUXrC0vDamPZKmGrRx2LssmkIOE="; + hash = "sha256-ciZJ4lNiaTszQ3FHOAKnKbDsnuKDN1CWkF+GiAjnQGg="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; diff --git a/pkgs/tools/networking/networkmanager/fix-install-paths.patch b/pkgs/tools/networking/networkmanager/fix-install-paths.patch index 2b2af0b2ad46..6b5f58194c58 100644 --- a/pkgs/tools/networking/networkmanager/fix-install-paths.patch +++ b/pkgs/tools/networking/networkmanager/fix-install-paths.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index f71c9fd4aa..deddf28816 100644 +index 61c025b9d7..d2ae60da34 100644 --- a/meson.build +++ b/meson.build -@@ -1022,9 +1022,9 @@ meson.add_install_script( +@@ -1025,9 +1025,9 @@ meson.add_install_script( join_paths('tools', 'meson-post-install.sh'), nm_datadir, nm_bindir, diff --git a/pkgs/tools/networking/networkmanager/fix-paths.patch b/pkgs/tools/networking/networkmanager/fix-paths.patch index 6c97b672e679..2a1cc23e3079 100644 --- a/pkgs/tools/networking/networkmanager/fix-paths.patch +++ b/pkgs/tools/networking/networkmanager/fix-paths.patch @@ -24,10 +24,10 @@ index f09ae86ceb..b2ecb405ef 100644 ExecStart=@sbindir@/NetworkManager --no-daemon Restart=on-failure diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c -index 2038e2f205..90bf9fa28b 100644 +index a9e8c08508..875d6cc2cd 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c -@@ -14275,14 +14275,14 @@ nm_device_start_ip_check(NMDevice *self) +@@ -14645,14 +14645,14 @@ nm_device_start_ip_check(NMDevice *self) gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET); if (gw) { nm_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf); @@ -45,25 +45,25 @@ index 2038e2f205..90bf9fa28b 100644 } } diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build -index fb879dca47..13cc2867e1 100644 +index 79ac95598a..83f7ab1373 100644 --- a/src/libnm-client-impl/meson.build +++ b/src/libnm-client-impl/meson.build -@@ -173,7 +173,6 @@ if enable_introspection - input: libnm_core_settings_sources, - output: 'nm-propery-infos-' + info + '.xml', +@@ -191,7 +191,6 @@ if enable_introspection + input: [gen_infos_cmd, libnm_gir[0]] + libnm_core_settings_sources, + output: 'nm-property-infos-' + name + '.xml', command: [ - python.path(), - join_paths(meson.source_root(), 'tools', 'generate-docs-nm-property-infos.py'), - info, + gen_infos_cmd, + name, '@OUTPUT@', -@@ -230,7 +229,6 @@ if enable_introspection - 'env', - 'GI_TYPELIB_PATH=' + gi_typelib_path, - 'LD_LIBRARY_PATH=' + ld_library_path, -- python.path(), - join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'), - '--lib-path', meson.current_build_dir(), - '--gir', '@INPUT@', +@@ -207,7 +206,6 @@ if enable_introspection + 'env', + 'GI_TYPELIB_PATH=' + gi_typelib_path, + 'LD_LIBRARY_PATH=' + ld_library_path, +- python.path(), + gen_gir_cmd, + '--lib-path', meson.current_build_dir(), + '--gir', libnm_gir[0], diff --git a/src/libnmc-base/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c index cbe76f5f1c..8515f94994 100644 --- a/src/libnmc-base/nm-vpn-helpers.c @@ -102,25 +102,25 @@ index cbe76f5f1c..8515f94994 100644 oc_argv[oc_argc++] = path; oc_argv[oc_argc++] = "--authenticate"; diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build -index cf8a21fc80..61d8e140e2 100644 +index 7fb460dc33..790a2b75fc 100644 --- a/src/libnmc-setting/meson.build +++ b/src/libnmc-setting/meson.build -@@ -7,7 +7,6 @@ if enable_docs - input: [nm_settings_docs_xml_gir, nm_property_infos_xml['nmcli']], +@@ -9,7 +9,6 @@ if enable_docs + input: [merge_cmd, nm_settings_docs_xml_gir['nmcli'], nm_property_infos_xml['nmcli']], output: 'settings-docs-input.xml', command: [ - python.path(), - join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-merge.py'), + merge_cmd, '@OUTPUT@', nm_property_infos_xml['nmcli'], -@@ -20,7 +19,6 @@ if enable_docs - input: settings_docs_input_xml, +@@ -23,7 +22,6 @@ if enable_docs + input: [gen_cmd, settings_docs_input_xml], output: 'settings-docs.h', command: [ - python.path(), - join_paths(meson.source_root(), 'tools', 'generate-docs-settings-docs.py'), + gen_cmd, '--output', '@OUTPUT@', - '--xml', '@INPUT@' + '--xml', settings_docs_input_xml diff --git a/src/tests/client/meson.build b/src/tests/client/meson.build index 8c36e40559..cfb6649a21 100644 --- a/src/tests/client/meson.build diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 0c7d378eb2a0..617f5f03f1c3 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -51,17 +51,42 @@ stdenv.mkDerivation (finalAttrs: { pname = "unbound"; - version = "1.19.1"; + version = "1.19.2"; src = fetchurl { url = "https://nlnetlabs.nl/downloads/unbound/unbound-${finalAttrs.version}.tar.gz"; - hash = "sha256-vB1Xbz3YRqBzmtxB/6pwJATGdn0rYILeufL5fLsko6k="; + hash = "sha256-zFYNNFc0ImwbOecadpeX5/3eImXLt3685UJwS7pInlU="; }; + + # Cherry pick some already merged upstream patches for configure + patches = [ + # Search for protobuf-c with pkg-config + # https://github.com/NLnetLabs/unbound/pull/999 + (fetchpatch { + url = "https://github.com/NLnetLabs/unbound/commit/59d98b9ef64e597c331c27160715d7a1b40c8638.patch"; + hash = "sha256-DvYoYBTXOwbR8Z0GRgt724WqX3dbIEOdICU2/VMRSVQ="; + }) + # Fix for previous patch + # https://github.com/NLnetLabs/unbound/issues/1006 + (fetchpatch { + url = "https://github.com/NLnetLabs/unbound/commit/93490a0fc1bf9e62e6edcd6b69f1463c7ac410e9.patch"; + hash = "sha256-mBo63ZlayD3YkOgIoQN0dG+xuFq/BxcjBmSo1vapiYA="; + excludes = [ "doc/Changelog" ]; + }) + # Fix for previous patch + # https://github.com/NLnetLabs/unbound/commit/3f5175584b0bb9ff7d417bc195ec6e4316ae58d3 + (fetchpatch { + url = "https://github.com/NLnetLabs/unbound/commit/3f5175584b0bb9ff7d417bc195ec6e4316ae58d3.patch"; + hash = "sha256-DcWfvmk+4K3c9Z+4grwzEGIkEBYNpbTK3xuBqRI33fY="; + }) + ]; + outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB nativeBuildInputs = lib.optionals withMakeWrapper [ makeWrapper ] + ++ lib.optionals withDNSTAP [ protobufc ] ++ [ pkg-config ] ++ lib.optionals withPythonModule [ swig ]; @@ -97,7 +122,6 @@ stdenv.mkDerivation (finalAttrs: { "--with-libsodium=${symlinkJoin { name = "libsodium-full"; paths = [ libsodium.dev libsodium.out ]; }}" ] ++ lib.optionals withDNSTAP [ "--enable-dnstap" - "--with-protobuf-c=${protobufc}" ] ++ lib.optionals withTFO [ "--enable-tfo-client" "--enable-tfo-server" |