From 6aa47aa04211211cef9040e1ed76b1abdd1d79a4 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 1 Feb 2020 17:16:02 -0500
Subject: [PATCH 1/2] networkmanager: 1.22.4 -> 1.22.6

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/blob/1.22.6/NEWS
---
 pkgs/tools/networking/network-manager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 1a33a735cfe..571b907ee2f 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -10,11 +10,11 @@ let
   pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
 in stdenv.mkDerivation rec {
   pname = "network-manager";
-  version = "1.22.4";
+  version = "1.22.6";
 
   src = fetchurl {
     url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
-    sha256 = "0682hm5l3ix8cq35yl5pxidri4kxbdnvj9llf8vg9mcg5abdaslv";
+    sha256 = "0r65hk7nw44jq4k6h91wrprr0x9410ibd1n7mpmlh4f4kgy276dw";
   };
 
   outputs = [ "out" "dev" "devdoc" "man" "doc" ];

From f025935dc60d69fa735a4707af2ccb2d7890f999 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 1 Feb 2020 17:19:47 -0500
Subject: [PATCH 2/2] networkmanager: reorganize directory

This was a bit of a mess.
---
 .../network-manager/{applet.nix => applet/default.nix}      | 0
 .../network-manager/{ => applet}/hardcode-gsettings.patch   | 0
 .../network-manager/{dmenu.nix => dmenu/default.nix}        | 0
 .../{strongswan.nix => strongswan/default.nix}              | 0
 pkgs/top-level/all-packages.nix                             | 6 +++---
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/tools/networking/network-manager/{applet.nix => applet/default.nix} (100%)
 rename pkgs/tools/networking/network-manager/{ => applet}/hardcode-gsettings.patch (100%)
 rename pkgs/tools/networking/network-manager/{dmenu.nix => dmenu/default.nix} (100%)
 rename pkgs/tools/networking/network-manager/{strongswan.nix => strongswan/default.nix} (100%)

diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet/default.nix
similarity index 100%
rename from pkgs/tools/networking/network-manager/applet.nix
rename to pkgs/tools/networking/network-manager/applet/default.nix
diff --git a/pkgs/tools/networking/network-manager/hardcode-gsettings.patch b/pkgs/tools/networking/network-manager/applet/hardcode-gsettings.patch
similarity index 100%
rename from pkgs/tools/networking/network-manager/hardcode-gsettings.patch
rename to pkgs/tools/networking/network-manager/applet/hardcode-gsettings.patch
diff --git a/pkgs/tools/networking/network-manager/dmenu.nix b/pkgs/tools/networking/network-manager/dmenu/default.nix
similarity index 100%
rename from pkgs/tools/networking/network-manager/dmenu.nix
rename to pkgs/tools/networking/network-manager/dmenu/default.nix
diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan/default.nix
similarity index 100%
rename from pkgs/tools/networking/network-manager/strongswan.nix
rename to pkgs/tools/networking/network-manager/strongswan/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e3e48c4378..e5ae392149c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5254,11 +5254,11 @@ in
 
   networkmanager-fortisslvpn = callPackage ../tools/networking/network-manager/fortisslvpn { };
 
-  networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan.nix { };
+  networkmanager_strongswan = callPackage ../tools/networking/network-manager/strongswan { };
 
-  networkmanagerapplet = callPackage ../tools/networking/network-manager/applet.nix { };
+  networkmanagerapplet = callPackage ../tools/networking/network-manager/applet { };
 
-  networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu.nix  { };
+  networkmanager_dmenu = callPackage ../tools/networking/network-manager/dmenu  { };
 
   newsboat = callPackage ../applications/networking/feedreaders/newsboat {
     inherit (darwin.apple_sdk.frameworks) Security;