From 3272f10024166d50fe970c4f415e56be43ec88b6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 5 Jul 2018 19:18:07 +0200
Subject: [PATCH] networkmanager-openvpn: move to a subdirectory

---
 .../network-manager/{openvpn.nix => openvpn/default.nix}      | 4 ++--
 .../networking/network-manager/{ => openvpn}/fix-paths.patch  | 0
 pkgs/top-level/all-packages.nix                               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/tools/networking/network-manager/{openvpn.nix => openvpn/default.nix} (93%)
 rename pkgs/tools/networking/network-manager/{ => openvpn}/fix-paths.patch (100%)

diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix
similarity index 93%
rename from pkgs/tools/networking/network-manager/openvpn.nix
rename to pkgs/tools/networking/network-manager/openvpn/default.nix
index b1ee3da1b058..2eef7f31ab55 100644
--- a/pkgs/tools/networking/network-manager/openvpn.nix
+++ b/pkgs/tools/networking/network-manager/openvpn/default.nix
@@ -3,13 +3,13 @@
 
 let
   pname   = "NetworkManager-openvpn";
-  version = "1.8.2";
+  version = "1.8.4";
 in stdenv.mkDerivation rec {
   name    = "${pname}${if withGnome then "-gnome" else ""}-${version}";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0p9pjk81h1j1dk9jkkvvk17cq21wyq5kfa4j49fmx9b9yg8syqc8";
+    sha256 = "0gyrv46h9k17qym48qacq4zpxbap6hi17shn921824zm98m2bdvr";
   };
 
   patches = [
diff --git a/pkgs/tools/networking/network-manager/fix-paths.patch b/pkgs/tools/networking/network-manager/openvpn/fix-paths.patch
similarity index 100%
rename from pkgs/tools/networking/network-manager/fix-paths.patch
rename to pkgs/tools/networking/network-manager/openvpn/fix-paths.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b1219690d7f..6c01ddd13688 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4047,7 +4047,7 @@ with pkgs;
 
   networkmanager-iodine = callPackage ../tools/networking/network-manager/iodine.nix { };
 
-  networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn.nix { };
+  networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn { };
 
   networkmanager-l2tp = callPackage ../tools/networking/network-manager/l2tp.nix { };