pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #137233 from maxeaubrey/modemmanager_1.18.0

authored by maxine [they] and committed by GitHub d1a18a3d 9c44b1b0

+4 -11
unified split
-7
nixos/modules/services/networking/networkmanager.nix
··· 502 503 systemd.services.ModemManager.aliases = [ "dbus-org.freedesktop.ModemManager1.service" ]; 504 505 - # override unit as recommended by upstream - see https://github.com/NixOS/nixpkgs/issues/88089 506 - # TODO: keep an eye on modem-manager releases as this will eventually be added to the upstream unit 507 - systemd.services.ModemManager.serviceConfig.ExecStart = [ 508 - "" 509 - "${pkgs.modemmanager}/sbin/ModemManager --filter-policy=STRICT" 510 - ]; 511 - 512 systemd.services.NetworkManager-dispatcher = { 513 wantedBy = [ "network.target" ]; 514 restartTriggers = [ configFile overrideNameserversScript ];
··· 502 503 systemd.services.ModemManager.aliases = [ "dbus-org.freedesktop.ModemManager1.service" ]; 504 505 systemd.services.NetworkManager-dispatcher = { 506 wantedBy = [ "network.target" ]; 507 restartTriggers = [ configFile overrideNameserversScript ];
+2 -2
pkgs/development/libraries/libqmi/default.nix
··· 15 16 stdenv.mkDerivation rec { 17 pname = "libqmi"; 18 - version = "1.28.8"; 19 20 outputs = [ "out" "dev" "devdoc" ]; 21 22 src = fetchurl { 23 url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; 24 - sha256 = "sha256-bju70gC8G2SyP2JU/vkhLyaZ7HfPsyB10rpQecc6n3g="; 25 }; 26 27 nativeBuildInputs = [
··· 15 16 stdenv.mkDerivation rec { 17 pname = "libqmi"; 18 + version = "1.30.2"; 19 20 outputs = [ "out" "dev" "devdoc" ]; 21 22 src = fetchurl { 23 url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; 24 + sha256 = "sha256-vgHs4OosIZTL6ldEv1qvBsBLpft+x4h6ExFsdtEU/t0="; 25 }; 26 27 nativeBuildInputs = [
+2 -2
pkgs/tools/networking/modemmanager/default.nix
··· 5 6 stdenv.mkDerivation rec { 7 pname = "modemmanager"; 8 - version = "1.16.10"; 9 10 src = fetchurl { 11 url = "https://www.freedesktop.org/software/ModemManager/ModemManager-${version}.tar.xz"; 12 - sha256 = "sha256-LM8fcWwtEh6OZwm8+K8p7oaXGpCtrMoujWKIswJ4hi4="; 13 }; 14 15 nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ];
··· 5 6 stdenv.mkDerivation rec { 7 pname = "modemmanager"; 8 + version = "1.18.2"; 9 10 src = fetchurl { 11 url = "https://www.freedesktop.org/software/ModemManager/ModemManager-${version}.tar.xz"; 12 + sha256 = "sha256-N0vhWK4cH7OKKe7xzDzfif81NrSP8TINIIqyBOpsX4o="; 13 }; 14 15 nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ];