b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #155414 from jwygoda/fcc-unlock

Browse source 
modemmanager: 1.18.2 -> 1.18.4
This commit is contained in:
Jan Tojnar 2022-01-20 08:14:14 +01:00 committed by GitHub
parent d0a1972091 8e49e6168a
commit a3a525b7b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
View file

@ -636,6 +636,17 @@
warning.
</para>
</listitem>
<listitem>
<para>
The option
<link linkend="opt-services.networking.networkmanager.enableFccUnlock">services.networking.networkmanager.enableFccUnlock</link>
was added to support FCC unlock procedures. Since release
1.18.4, the ModemManager daemon no longer automatically
performs the FCC unlock procedure by default. See
<link xlink:href="https://modemmanager.org/docs/modemmanager/fcc-unlock/">the
docs</link> for more details.
</para>
</listitem>
</itemizedlist>
</section>
</section>

6
nixos/doc/manual/release-notes/rl-2205.section.md
View file

@ -220,4 +220,10 @@ In addition to numerous new and upgraded packages, this release has the followin
Reason is that the old name has been deprecated upstream.
Using the old option name will still work, but produce a warning.
- The option
[services.networking.networkmanager.enableFccUnlock](#opt-services.networking.networkmanager.enableFccUnlock)
was added to support FCC unlock procedures. Since release 1.18.4, the ModemManager
daemon no longer automatically performs the FCC unlock procedure by default. See
[the docs](https://modemmanager.org/docs/modemmanager/fcc-unlock/) for more details.
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

17
nixos/modules/services/networking/networkmanager.nix
View file

@ -384,6 +384,17 @@ in {
so you don't need to to that yourself.
'';
};
enableFccUnlock = mkOption {
type = types.bool;
default = false;
description = ''
Enable FCC unlock procedures. Since release 1.18.4, the ModemManager daemon no longer
automatically performs the FCC unlock procedure by default. See
<link xlink:href="https://modemmanager.org/docs/modemmanager/fcc-unlock/">the docs</link>
for more details.
'';
};
};
};
@ -438,7 +449,13 @@ in {
"NetworkManager/VPN/nm-sstp-service.name".source =
"${networkmanager-sstp}/lib/NetworkManager/VPN/nm-sstp-service.name";
}
// optionalAttrs cfg.enableFccUnlock
{
"ModemManager/fcc-unlock.d".source =
"${pkgs.modemmanager}/share/ModemManager/fcc-unlock.available.d/*";
}
// optionalAttrs (cfg.appendNameservers != [] || cfg.insertNameservers != [])
{
"NetworkManager/dispatcher.d/02overridedns".source = overrideNameserversScript;

4
pkgs/tools/networking/modemmanager/default.nix
View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
pname = "modemmanager";
version = "1.18.2";
version = "1.18.4";
src = fetchurl {
url = "https://www.freedesktop.org/software/ModemManager/ModemManager-${version}.tar.xz";
sha256 = "sha256-N0vhWK4cH7OKKe7xzDzfif81NrSP8TINIIqyBOpsX4o=";
sha256 = "sha256-EfuXD2Pi2ojfS22HWeTuZJlExRUkS5eb9Qp6bfHX8Zk=";
};
nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ];