mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 19:21:04 +00:00
ivpn: 3.10.15 -> 3.14.29 (#354428)
This commit is contained in:
commit
4483ca5298
|
@ -1,92 +1,115 @@
|
|||
{ buildGoModule
|
||||
, fetchFromGitHub
|
||||
, lib
|
||||
, wirelesstools
|
||||
, makeWrapper
|
||||
, wireguard-tools
|
||||
, openvpn
|
||||
, obfs4
|
||||
, iproute2
|
||||
, dnscrypt-proxy
|
||||
, iptables
|
||||
, gawk
|
||||
, util-linux
|
||||
{
|
||||
buildGoModule,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
wirelesstools,
|
||||
makeWrapper,
|
||||
wireguard-tools,
|
||||
openvpn,
|
||||
obfs4,
|
||||
iproute2,
|
||||
dnscrypt-proxy,
|
||||
iptables,
|
||||
gawk,
|
||||
util-linux,
|
||||
}:
|
||||
|
||||
builtins.mapAttrs (pname: attrs: buildGoModule (attrs // rec {
|
||||
inherit pname;
|
||||
version = "3.10.15";
|
||||
builtins.mapAttrs
|
||||
(
|
||||
pname: attrs:
|
||||
buildGoModule (
|
||||
attrs
|
||||
// rec {
|
||||
inherit pname;
|
||||
version = "3.14.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ivpn";
|
||||
repo = "desktop-app";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-3yVRVM98tVjot3gIkUb/CDwmwKdOOBjBjzGL6htDtpk=";
|
||||
};
|
||||
buildInputs = [
|
||||
wirelesstools
|
||||
];
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/ivpn/desktop-app/daemon/version._version=${version}"
|
||||
"-X github.com/ivpn/desktop-app/daemon/version._time=1970-01-01"
|
||||
];
|
||||
src = fetchFromGitHub {
|
||||
owner = "ivpn";
|
||||
repo = "desktop-app";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-8JScty/sGyxzC2ojRpatHpCqEXZw9ksMortIhZnukoU=";
|
||||
};
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/{${attrs.modRoot},${pname}}
|
||||
'';
|
||||
proxyVendor = true; # .c file
|
||||
|
||||
meta = with lib; {
|
||||
description = "Official IVPN Desktop app";
|
||||
homepage = "https://www.ivpn.net/apps";
|
||||
changelog = "https://github.com/ivpn/desktop-app/releases/tag/v${version}";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ urandom ataraxiasjel ];
|
||||
mainProgram = "ivpn";
|
||||
};
|
||||
})) {
|
||||
ivpn = {
|
||||
modRoot = "cli";
|
||||
vendorHash = "sha256-T49AE3SUmdP3Tu9Sp5C/QryKDto/NzEqRuUQ3+aJFL0=";
|
||||
};
|
||||
ivpn-service = {
|
||||
modRoot = "daemon";
|
||||
vendorHash = "sha256-9Rk6ruMpyWtQe+90kw4F8OLq7/JcDSrG6ufkfcrS4W8=";
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ wirelesstools ];
|
||||
ldflags = [
|
||||
"-s"
|
||||
"-w"
|
||||
"-X github.com/ivpn/desktop-app/daemon/version._version=${version}"
|
||||
"-X github.com/ivpn/desktop-app/daemon/version._time=1970-01-01"
|
||||
];
|
||||
|
||||
patches = [ ./permissions.patch ];
|
||||
postPatch = ''
|
||||
substituteInPlace daemon/service/platform/platform_linux.go \
|
||||
--replace 'openVpnBinaryPath = "/usr/sbin/openvpn"' \
|
||||
'openVpnBinaryPath = "${openvpn}/bin/openvpn"' \
|
||||
--replace 'routeCommand = "/sbin/ip route"' \
|
||||
'routeCommand = "${iproute2}/bin/ip route"'
|
||||
postInstall = ''
|
||||
mv $out/bin/{${attrs.modRoot},${pname}}
|
||||
'';
|
||||
|
||||
substituteInPlace daemon/netinfo/netinfo_linux.go \
|
||||
--replace 'retErr := shell.ExecAndProcessOutput(log, outParse, "", "/sbin/ip", "route")' \
|
||||
'retErr := shell.ExecAndProcessOutput(log, outParse, "", "${iproute2}/bin/ip", "route")'
|
||||
meta = {
|
||||
description = "Official IVPN Desktop app";
|
||||
homepage = "https://www.ivpn.net/apps";
|
||||
changelog = "https://github.com/ivpn/desktop-app/releases/tag/v${version}";
|
||||
license = lib.licenses.gpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
urandom
|
||||
ataraxiasjel
|
||||
];
|
||||
mainProgram = "ivpn";
|
||||
};
|
||||
}
|
||||
)
|
||||
)
|
||||
{
|
||||
ivpn = {
|
||||
modRoot = "cli";
|
||||
vendorHash = "sha256-STbkFchrmxwWnSgEJ7RGKN3jGaCC0npL80YjlwUcs1g=";
|
||||
};
|
||||
ivpn-service = {
|
||||
modRoot = "daemon";
|
||||
vendorHash = "sha256-REIY3XPyMA2Loxo1mKzJMJwZrf9dQMOtnQOUEgN5LP8=";
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
substituteInPlace daemon/service/platform/platform_linux_release.go \
|
||||
--replace 'installDir := "/opt/ivpn"' "installDir := \"$out\"" \
|
||||
--replace 'obfsproxyStartScript = path.Join(installDir, "obfsproxy/obfs4proxy")' \
|
||||
'obfsproxyStartScript = "${lib.getExe obfs4}"' \
|
||||
--replace 'wgBinaryPath = path.Join(installDir, "wireguard-tools/wg-quick")' \
|
||||
'wgBinaryPath = "${wireguard-tools}/bin/wg-quick"' \
|
||||
--replace 'wgToolBinaryPath = path.Join(installDir, "wireguard-tools/wg")' \
|
||||
'wgToolBinaryPath = "${wireguard-tools}/bin/wg"' \
|
||||
--replace 'dnscryptproxyBinPath = path.Join(installDir, "dnscrypt-proxy/dnscrypt-proxy")' \
|
||||
'dnscryptproxyBinPath = "${dnscrypt-proxy}/bin/dnscrypt-proxy"'
|
||||
'';
|
||||
patches = [ ./permissions.patch ];
|
||||
postPatch = ''
|
||||
substituteInPlace daemon/service/platform/platform_linux.go \
|
||||
--replace 'openVpnBinaryPath = "/usr/sbin/openvpn"' \
|
||||
'openVpnBinaryPath = "${openvpn}/bin/openvpn"' \
|
||||
--replace 'routeCommand = "/sbin/ip route"' \
|
||||
'routeCommand = "${iproute2}/bin/ip route"'
|
||||
|
||||
postFixup = ''
|
||||
mkdir -p $out/etc
|
||||
cp -r $src/daemon/References/Linux/etc/* $out/etc/
|
||||
cp -r $src/daemon/References/common/etc/* $out/etc/
|
||||
substituteInPlace daemon/netinfo/netinfo_linux.go \
|
||||
--replace 'retErr := shell.ExecAndProcessOutput(log, outParse, "", "/sbin/ip", "route")' \
|
||||
'retErr := shell.ExecAndProcessOutput(log, outParse, "", "${iproute2}/bin/ip", "route")'
|
||||
|
||||
patchShebangs --build $out/etc/firewall.sh $out/etc/splittun.sh $out/etc/client.down $out/etc/client.up
|
||||
substituteInPlace daemon/service/platform/platform_linux_release.go \
|
||||
--replace 'installDir := "/opt/ivpn"' "installDir := \"$out\"" \
|
||||
--replace 'obfsproxyStartScript = path.Join(installDir, "obfsproxy/obfs4proxy")' \
|
||||
'obfsproxyStartScript = "${lib.getExe obfs4}"' \
|
||||
--replace 'wgBinaryPath = path.Join(installDir, "wireguard-tools/wg-quick")' \
|
||||
'wgBinaryPath = "${wireguard-tools}/bin/wg-quick"' \
|
||||
--replace 'wgToolBinaryPath = path.Join(installDir, "wireguard-tools/wg")' \
|
||||
'wgToolBinaryPath = "${wireguard-tools}/bin/wg"' \
|
||||
--replace 'dnscryptproxyBinPath = path.Join(installDir, "dnscrypt-proxy/dnscrypt-proxy")' \
|
||||
'dnscryptproxyBinPath = "${dnscrypt-proxy}/bin/dnscrypt-proxy"'
|
||||
'';
|
||||
|
||||
wrapProgram "$out/bin/ivpn-service" \
|
||||
--suffix PATH : ${lib.makeBinPath [ iptables gawk util-linux ]}
|
||||
'';
|
||||
};
|
||||
}
|
||||
postFixup = ''
|
||||
mkdir -p $out/etc
|
||||
cp -r $src/daemon/References/Linux/etc/* $out/etc/
|
||||
cp -r $src/daemon/References/common/etc/* $out/etc/
|
||||
|
||||
patchShebangs --build $out/etc/firewall.sh $out/etc/splittun.sh $out/etc/client.down $out/etc/client.up
|
||||
|
||||
wrapProgram "$out/bin/ivpn-service" \
|
||||
--suffix PATH : ${
|
||||
lib.makeBinPath [
|
||||
iptables
|
||||
gawk
|
||||
util-linux
|
||||
]
|
||||
}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue