diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2022-06-17 22:39:31 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-06-23 16:24:40 +0000 |
| commit | 1a35bcca26ffe5420441e741b67b27a96a24012c (patch) | |
| tree | 26288268a388b859492b98ca71b0aaa850ebd5c0 | |
| parent | Merge pull request #178618 from NixOS/backport-177673-to-release-22.05 (diff) | |
| download | nixpkgs-origin/backport-178071-to-release-22.05.tar.gz | |
networkmanager: Apply several fixes for OWEorigin/backport-178071-to-release-22.05
The patches have already landed on main and are considered for
backporting to 1.38.x.
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1259
(cherry picked from commit 010c4593c7f1b94d0c95f2446f3f15b0f9f79e2c)
| -rw-r--r-- | pkgs/tools/networking/networkmanager/default.nix | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index c85d7ef61281..97a029d353b2 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -119,6 +119,22 @@ 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 + + (fetchpatch { + # Prevent downgrade to plain network on Enhanced Open profiles + url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/b7946e50acc0d20d31b0c1098fdadc2f105ba799.patch"; + hash = "sha256-CdZiubfqhJQ5w4+s9O8C5WI9Ls/paONzDX4rX6yEmS0="; + }) + (fetchpatch { + # Treat OWE BSSIDs as valid candidates for open profiles + url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/dd80cdcc1bd5e2535b8e4a1d1d0c62f1d3328a7c.patch"; + hash = "sha256-QMZvWN3g8K+UH6y05+RkCmF+gHHU4pB+UXfU770AUis="; + }) + (fetchpatch { + # Allow distinguishing pure OWE networks from those with transition mode enabled + url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/commit/13ea8d2e7dddd8279c82230594cea533ca349dd3.patch"; + hash = "sha256-BiINGzX/Zp8pwdbMiDScrZvrHtH7coXkZm1HScFuFWA="; + }) ]; buildInputs = [ |