From 4418cb31fd7aa4fbee5aaf4fc00cbbcd3ee30562 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Thu, 9 Sep 2021 23:03:20 +0200 Subject: [PATCH 1/3] libqmi: 1.28.8 -> 1.30.2 - https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/blob/1.30.2/NEWS - https://lists.freedesktop.org/archives/libqmi-devel/2021-August/003667.html - https://lists.freedesktop.org/archives/libqmi-devel/2021-September/003697.html --- pkgs/development/libraries/libqmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 196b9d3ad521..c3c9bf6947eb 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.28.8"; + version = "1.30.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "sha256-bju70gC8G2SyP2JU/vkhLyaZ7HfPsyB10rpQecc6n3g="; + sha256 = "sha256-vgHs4OosIZTL6ldEv1qvBsBLpft+x4h6ExFsdtEU/t0="; }; nativeBuildInputs = [ From 2c1e66bf0edf9d95e8680ce9ad8f9bc6ebd8d56a Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Thu, 9 Sep 2021 23:05:40 +0200 Subject: [PATCH 2/3] modemmanager: 1.16.10 -> 1.18.2 - https://lists.freedesktop.org/archives/modemmanager-devel/2021-September/008826.html - https://lists.freedesktop.org/archives/modemmanager-devel/2021-September/008836.html --- pkgs/tools/networking/modemmanager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index e352e67d3fe5..299342197897 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "modemmanager"; - version = "1.16.10"; + version = "1.18.2"; src = fetchurl { url = "https://www.freedesktop.org/software/ModemManager/ModemManager-${version}.tar.xz"; - sha256 = "sha256-LM8fcWwtEh6OZwm8+K8p7oaXGpCtrMoujWKIswJ4hi4="; + sha256 = "sha256-N0vhWK4cH7OKKe7xzDzfif81NrSP8TINIIqyBOpsX4o="; }; nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; From e05c1e3431d5c025f161a989aebce37c59ca67cb Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Sat, 25 Sep 2021 15:04:28 +0200 Subject: [PATCH 3/3] nixos/networkmanager: drop modemmanager overrides as of 1.18.0, modemmanager defaults to strict when no other options are passed, so we can just use the upstream unit as is --- nixos/modules/services/networking/networkmanager.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index c8861171dd6c..74e12f4f98e8 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -501,13 +501,6 @@ in { systemd.services.ModemManager.aliases = [ "dbus-org.freedesktop.ModemManager1.service" ]; - # override unit as recommended by upstream - see https://github.com/NixOS/nixpkgs/issues/88089 - # TODO: keep an eye on modem-manager releases as this will eventually be added to the upstream unit - systemd.services.ModemManager.serviceConfig.ExecStart = [ - "" - "${pkgs.modemmanager}/sbin/ModemManager --filter-policy=STRICT" - ]; - systemd.services.NetworkManager-dispatcher = { wantedBy = [ "network.target" ]; restartTriggers = [ configFile overrideNameserversScript ];