about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2020-04-23 19:22:02 +0100
committerGitHub <noreply@github.com>2020-04-23 19:22:02 +0100
commit0ab6891b879bf6e38616d064968ad0df50e2c0fe (patch)
treeba8c66f4f4c444a358fe04bbdf847b866c6baace /pkgs/tools
parent189d14856c96314477f8f8f12472364bad07d034 (diff)
parentf35d50c68c33038f2c8dbca043e788b7377b3c76 (diff)
downloadnixlib-0ab6891b879bf6e38616d064968ad0df50e2c0fe.tar
nixlib-0ab6891b879bf6e38616d064968ad0df50e2c0fe.tar.gz
nixlib-0ab6891b879bf6e38616d064968ad0df50e2c0fe.tar.bz2
nixlib-0ab6891b879bf6e38616d064968ad0df50e2c0fe.tar.lz
nixlib-0ab6891b879bf6e38616d064968ad0df50e2c0fe.tar.xz
nixlib-0ab6891b879bf6e38616d064968ad0df50e2c0fe.tar.zst
nixlib-0ab6891b879bf6e38616d064968ad0df50e2c0fe.zip
Merge pull request #85858 from mmilata/openvpn-2.4.9
openvpn: 2.4.7 -> 2.4.9
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/networking/openvpn/default.nix13
1 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 88ed0599c2ce..09ad8db46ea8 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -19,11 +19,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "openvpn";
-  version = "2.4.7";
+  version = "2.4.9";
 
   src = fetchurl {
     url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.xz";
-    sha256 = "0j7na936isk9j8nsdrrbw7wmy09inmjqvsb8mw8az7k61xbm6bx4";
+    sha256 = "1qpbllwlha7cffsd5dlddb8rl22g9rar5zflkz1wrcllhvfkl7v4";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -33,13 +33,6 @@ in stdenv.mkDerivation rec {
                   ++ optional useSystemd systemd
                   ++ optional pkcs11Support pkcs11helper;
 
-  patches = [
-    ( fetchpatch {
-      url = "https://sources.debian.org/data/main/o/openvpn/2.4.7-1/debian/patches/fix-pkcs11-helper-hang.patch";
-      sha256 = "0c8jzbfsmb0mm9f7kkjxac1hk8q6igm267s687vx3mdqs1wys6bm";
-    })
-  ];
-
   configureFlags = optionals stdenv.isLinux [
     "--enable-iproute2"
     "IPROUTE=${iproute}/sbin/ip" ]
@@ -68,7 +61,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A robust and highly flexible tunneling application";
-    downloadPage = "https://openvpn.net/index.php/open-source/downloads.html";
+    downloadPage = "https://openvpn.net/community-downloads/";
     homepage = "https://openvpn.net/";
     license = licenses.gpl2;
     maintainers = with maintainers; [ viric ];