mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-18 05:39:58 +00:00
wgnord: 0.2.1 -> 0.2.2
Update src.hash, install template.conf, turn the new query alias
into a function so resholve can see curl, add gawk for status,
and adopt the package.
Resolves #438189
Supersedes #453208
(cherry picked from commit 0d761b20d3)
This commit is contained in:
committed by
github-actions[bot]
parent
d0ef68bc7f
commit
7e2b3626c4
@@ -2,6 +2,7 @@
|
||||
bash,
|
||||
coreutils,
|
||||
curl,
|
||||
gawk,
|
||||
fetchFromGitHub,
|
||||
gnugrep,
|
||||
gnused,
|
||||
@@ -14,19 +15,21 @@
|
||||
|
||||
resholve.mkDerivation (finalAttrs: {
|
||||
pname = "wgnord";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "phirecc";
|
||||
repo = "wgnord";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-26cfYXtZVQ7kIRxY6oNGCqIjdw/hjwXhVKimVgolLgk=";
|
||||
hash = "sha256-K7O3SI24bkaLuEF+7FmbXUx7H0gPKsLttEmSCc3PT2c=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
sed -i 's|^alias query=.*|query() { curl -s -H "User-Agent: NordApp Linux $version $kernel-generic" "$@"; }|' wgnord
|
||||
substituteInPlace wgnord \
|
||||
--replace '$conf_dir/countries.txt' "$out/share/countries.txt" \
|
||||
--replace '$conf_dir/countries_iso31662.txt' "$out/share/countries_iso31662.txt"
|
||||
--replace-fail '$conf_dir/countries.txt' "$out/share/countries.txt" \
|
||||
--replace-fail '$conf_dir/countries_iso31662.txt' "$out/share/countries_iso31662.txt" \
|
||||
--replace-fail '$conf_dir/template.conf' "$out/share/template.conf"
|
||||
'';
|
||||
|
||||
dontBuild = true;
|
||||
@@ -35,6 +38,7 @@ resholve.mkDerivation (finalAttrs: {
|
||||
install -Dm 755 wgnord -t $out/bin/
|
||||
install -Dm 644 countries.txt -t $out/share/
|
||||
install -Dm 644 countries_iso31662.txt -t $out/share/
|
||||
install -Dm 644 template.conf -t $out/share/
|
||||
'';
|
||||
|
||||
solutions.default = {
|
||||
@@ -43,6 +47,7 @@ resholve.mkDerivation (finalAttrs: {
|
||||
inputs = [
|
||||
coreutils
|
||||
curl
|
||||
gawk
|
||||
gnugrep
|
||||
gnused
|
||||
iproute2
|
||||
@@ -59,7 +64,7 @@ resholve.mkDerivation (finalAttrs: {
|
||||
meta = {
|
||||
description = "NordVPN Wireguard (NordLynx) client in POSIX shell";
|
||||
homepage = "https://github.com/phirecc/wgnord";
|
||||
maintainers = [ ];
|
||||
maintainers = with lib.maintainers; [ novalkun ];
|
||||
license = lib.licenses.mit;
|
||||
mainProgram = "wgnord";
|
||||
platforms = lib.platforms.linux;
|
||||
|
||||
Reference in New Issue
Block a user