mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
openvpn3: 17_beta -> 18_beta
This commit is contained in:
parent
ee8c92270b
commit
6e81e1b473
1 changed files with 4 additions and 14 deletions
|
@ -4,7 +4,6 @@
|
|||
, asio
|
||||
, autoconf-archive
|
||||
, autoreconfHook
|
||||
, fetchpatch
|
||||
, glib
|
||||
, gtest
|
||||
, jsoncpp
|
||||
|
@ -24,31 +23,22 @@ let
|
|||
openvpn3-core = fetchFromGitHub {
|
||||
owner = "OpenVPN";
|
||||
repo = "openvpn3";
|
||||
rev = "7765540e581c48721752bcad0b3d74b8397b1f73";
|
||||
sha256 = "sha256-v/suF/tWfuukQO1wFiHRzC7ZW+3Gh1tav6qj0uYUP4E=";
|
||||
rev = "c4fa5a69c5d2e4ba4a86e79da8de0fc95f95edc3";
|
||||
sha256 = "sha256-VhQkx35JKNqXKgg4i+/aJYIg3iXPGlC57wDrjDpvTyE=";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "openvpn3";
|
||||
# also update openvpn3-core
|
||||
version = "17_beta";
|
||||
version = "18_beta";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenVPN";
|
||||
repo = "openvpn3-linux";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ITSnC105YNYFW1M2bOASFemPZAh+HETIzX2ofABWTho=";
|
||||
sha256 = "sha256-4TKRnHjEm6QRE2artAa0t1VC+0XPgz3VpCfQS8tnrFQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# remove when v18_beta hits
|
||||
(fetchpatch {
|
||||
name = "dont-hardcode-gio.patch";
|
||||
url = "https://github.com/OpenVPN/openvpn3-linux/commit/f7d6d3ae1d52b18b398d3d3b6e21c720c98d0e89.patch";
|
||||
sha256 = "sha256-Bo5uaHadMTDROpwM7Y5aXhCoGUrsAAkSxeXLLhvOeEg=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
rm -r ./vendor/googletest
|
||||
cp -r ${gtest.src} ./vendor/googletest
|
||||
|
|
Loading…
Reference in a new issue