diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/networking/networkmanager/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/tools/networking/networkmanager/default.nix | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/tools/networking/networkmanager/default.nix b/nixpkgs/pkgs/tools/networking/networkmanager/default.nix index 2c49c3951cfd..a5cdc383f9ad 100644 --- a/nixpkgs/pkgs/tools/networking/networkmanager/default.nix +++ b/nixpkgs/pkgs/tools/networking/networkmanager/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , substituteAll -, intltool +, gettext , pkg-config , fetchpatch , dbus @@ -24,6 +24,7 @@ , libselinux , audit , gobject-introspection +, perl , modemmanager , openresolv , libndp @@ -57,11 +58,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.38.4"; + version = "1.42.6"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-hB9k1Bd2qt2SsVH0flD2K+igYRqQVv5r+BiBAk5qlsU="; + sha256 = "sha256-jDiKw3daxrzrYF+uIb4sPiYcr+YGeZSonw36RhDtAnk="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; @@ -112,6 +113,7 @@ stdenv.mkDerivation rec { "-Dfirewalld_zone=false" "-Dtests=no" "-Dcrypto=gnutls" + "-Dmobile_broadband_provider_info_database=${mobile-broadband-provider-info}/share/mobile-broadband-provider-info/serviceproviders.xml" ]; patches = [ @@ -124,6 +126,12 @@ stdenv.mkDerivation rec { # Meson does not support using different directories during build and # for installation like Autotools did with flags passed to make install. ./fix-install-paths.patch + + # Support for building with ppp 2.5.0 + (fetchpatch { + url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/5df19f5b26c5921a401e63fb329e844a02d6b1f2.diff"; + hash = "sha256-BDm0P2U4HENAtq7OowWVDxqALNbG0nr9k/CLdE61Sck="; + }) ]; buildInputs = [ @@ -153,10 +161,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja - intltool + gettext pkg-config vala gobject-introspection + perl elfutils # used to find jansson soname # Docs gtk-doc |