From a654c877a5943b44679282f84b82ed1081098003 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 5 Jul 2023 00:58:16 +0000 Subject: [PATCH] =?UTF-8?q?networkmanager:=201.42.6=20=E2=86=92=201.42.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/compare/1.42.6...1.42.8 (cherry picked from commit 72f9a50f5b21397141833e419fce8be3a0bd877a) --- pkgs/tools/networking/networkmanager/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index a5cdc383f9ad..ab747df01f86 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -4,7 +4,6 @@ , substituteAll , gettext , pkg-config -, fetchpatch , dbus , gnome , systemd @@ -58,11 +57,11 @@ let in stdenv.mkDerivation rec { pname = "networkmanager"; - version = "1.42.6"; + version = "1.42.8"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "sha256-jDiKw3daxrzrYF+uIb4sPiYcr+YGeZSonw36RhDtAnk="; + sha256 = "sha256-AzfnWD0uxa3iui6MYl0vCe7M2h0ig27imqcpJdOZw1M="; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; @@ -126,12 +125,6 @@ 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 = [