Compare commits

..
2 Commits
Author SHA1 Message Date
Lumpiasty 1c59901eb1 update NetworkManager to 1.58-rc1 2026-07-05 16:24:39 +02:00
Lumpiasty b49bbadd4f use native networkmanager option for enabling clat 2026-07-05 16:14:05 +02:00
2 changed files with 9 additions and 9 deletions
+4 -6
View File
@@ -14,14 +14,12 @@
networking.networkmanager.package = pkgs.networkmanager-clat; networking.networkmanager.package = pkgs.networkmanager-clat;
# Drop a conf.d snippet that sets connection-level defaults. # Drop a conf.d snippet that sets connection-level defaults.
# NM reads /etc/NetworkManager/conf.d/*.conf in addition to NetworkManager.conf. networking.networkmanager.settings.connection = {
environment.etc."NetworkManager/conf.d/99-ipv6-mostly.conf".text = ''
# IPv6-mostly: automatically enable CLAT (464XLAT) and DHCPv4 option 108 # IPv6-mostly: automatically enable CLAT (464XLAT) and DHCPv4 option 108
# when the network advertises PREF64 and/or option 108 (RFC 8925). # when the network advertises PREF64 and/or option 108 (RFC 8925).
# On networks without these, behaviour is unchanged (native IPv4 proceeds). # On networks without these, behaviour is unchanged (native IPv4 proceeds).
[connection-defaults] "ipv4.clat" = "auto";
ipv4.clat=auto "ipv4.dhcp-ipv6-only-preferred" = "auto";
ipv4.dhcp-ipv6-only-preferred=auto };
'';
}; };
} }
+5 -3
View File
@@ -57,6 +57,7 @@
buildPackages, buildPackages,
nixosTests, nixosTests,
systemd, systemd,
slang,
udev, udev,
udevCheckHook, udevCheckHook,
withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
@@ -68,12 +69,12 @@ let
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "networkmanager"; pname = "networkmanager";
version = "1.57.4-dev"; version = "1.58-rc1";
src = fetchurl { src = fetchurl {
# Use the stable release tarball (not the git archive) — GitLab git archives are not content-stable. # Use the stable release tarball (not the git archive) — GitLab git archives are not content-stable.
url = "https://gitlab.freedesktop.org/api/v4/projects/411/packages/generic/NetworkManager/${finalAttrs.version}/NetworkManager-${finalAttrs.version}.tar.xz"; url = "https://gitlab.freedesktop.org/api/v4/projects/411/packages/generic/NetworkManager/${finalAttrs.version}/NetworkManager-${finalAttrs.version}.tar.xz";
hash = "sha256-ThYPO/0YsmFSc2Qol1ZAoQb1qdtjPRg+rvxpUzKe0sA="; hash = "sha256-k0Oi2/vswKLI6NS65J2rP8iYJlB206JJHGOgO26LOt4=";
}; };
outputs = [ outputs = [
@@ -154,6 +155,7 @@ stdenv.mkDerivation (finalAttrs: {
jansson jansson
dbus dbus
libbpf libbpf
slang
] ]
++ lib.optionals withNbft [ ++ lib.optionals withNbft [
libnvme libnvme
@@ -229,7 +231,7 @@ stdenv.mkDerivation (finalAttrs: {
meta = { meta = {
homepage = "https://networkmanager.dev"; homepage = "https://networkmanager.dev";
description = "Network configuration and management tool (1.57.4-dev with CLAT/ipv6-mostly support)"; description = "Network configuration and management tool (1.58-rc1 with CLAT/ipv6-mostly support)";
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
maintainers = with lib.maintainers; [ obadz ]; maintainers = with lib.maintainers; [ obadz ];
teams = [ lib.teams.freedesktop ]; teams = [ lib.teams.freedesktop ];