Merge pull request #246591 from farnoy/networkmanager-1.42.8-backport

This commit is contained in:
maxine
2023-08-12 00:32:40 +02:00
committed by GitHub

View File

@@ -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 = [