amnezia-vpn: init at 4.8.2.3; nixos/programs/amnezia-vpn: init #367972

sund3RRR · 2024-12-24T17:26:08Z

Closes #338380

Amnezia is an open-source VPN client, with a key feature that enables you to deploy your own VPN server on your server.

Road map:

Things done

Add a 👍 reaction to pull requests you find important.

sund3RRR · 2024-12-24T17:50:33Z

It would be really cool if someone could help test this.

clone my repo

git clone -b amneziaVPN-init [email protected]:sund3RRR/nixpkgs.git --depth 1

enable amneziaVPN program in your configuration.nix

programs.amnezia-vpn.enable = true;

rebuild from local nixpkgs

sudo nixos-rebuild -I nixpkgs=/absolute/path/to/your/nixpkgs test

sund3RRR · 2024-12-25T08:03:46Z

Added openvpn and tun2socks execution path patch. Unfortunately, this does not help.

XRay fails with 602 error, OpenVPN freeze on Connecting... state.

sund3RRR · 2024-12-26T13:02:06Z

Got OpenVPN working

sund3RRR · 2024-12-26T21:38:56Z

XRay is half working!
Working visually, not practically :D
Need to fix route add error

nixos-discourse · 2024-12-27T11:40:05Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/5010

K900 · 2025-01-01T15:43:49Z

Have you submitted the patch upstream?

sund3RRR · 2025-01-01T16:38:06Z

Have you submitted the patch upstream?

Now yes

SuperSandro2000 · 2025-01-02T22:33:04Z

pkgs/by-name/am/amnezia-vpn/package.nix

+    # install AmneziaVPN and AmneziaVPN-service
+    mkdir -p $out/bin
+    cp client/AmneziaVPN $out/bin/
+    cp service/server/AmneziaVPN-service $out/bin/
+    # install update-resolv-conf.sh
+    mkdir -p $out/local/bin
+    cp ../deploy/data/linux/client/bin/update-resolv-conf.sh $out/local/bin/
+    # install .desktop item
+    mkdir -p $out/share/applications
+    cp ../AppDir/AmneziaVPN.desktop $out/share/applications/
+    # install icon
+    mkdir -p $out/share/pixmaps/
+    cp ../deploy/data/linux/AmneziaVPN.png $out/share/pixmaps/


Suggested change

# install AmneziaVPN and AmneziaVPN-service

mkdir -p $out/bin

cp client/AmneziaVPN $out/bin/

cp service/server/AmneziaVPN-service $out/bin/

# install update-resolv-conf.sh

mkdir -p $out/local/bin

cp ../deploy/data/linux/client/bin/update-resolv-conf.sh $out/local/bin/

# install .desktop item

mkdir -p $out/share/applications

cp ../AppDir/AmneziaVPN.desktop $out/share/applications/

# install icon

mkdir -p $out/share/pixmaps/

cp ../deploy/data/linux/AmneziaVPN.png $out/share/pixmaps/

mkdir -p $out/bin $out/local/bin $out/share/applications $out/share/pixmaps/

cp client/AmneziaVPN service/server/AmneziaVPN-service $out/bin/

cp ../deploy/data/linux/client/bin/update-resolv-conf.sh $out/local/bin/

cp ../AppDir/AmneziaVPN.desktop $out/share/applications/

cp ../deploy/data/linux/AmneziaVPN.png $out/share/pixmaps/

$out/locan is a pretty none standard location for us

Is this ok? I don't want update-resolv-conf.sh to be in bin/ because this script is not intended to be used outside the package

SuperSandro2000 · 2025-01-02T22:33:16Z

pkgs/by-name/am/amnezia-vpn/package.nix

+  qtWrapperArgs = [
+    ''--prefix PATH : ${
+      lib.makeBinPath [
+        busybox


Why busybox and note coreutils?

because ip an sysctl are needed

Might make sense to use procps and iproute2 instead. Not sure, didn't test

@sund3RRR you might have overlooked this feedback, so i ping you again; can you try with procps and iproute2? That would imo be more reasonable than a dep on an alternative coreutils impl.

fine, it works! thank you

pkgs/by-name/am/amnezia-vpn/package.nix

SuperSandro2000 · 2025-01-02T22:35:52Z

pkgs/by-name/am/amnezia-vpn/package.nix

+  src = fetchFromGitHub {
+    owner = "amnezia-vpn";
+    repo = "amnezia-client";
+    rev = "refs/tags/${finalAttrs.version}";


Suggested change

rev = "refs/tags/${finalAttrs.version}";

tag = finalAttrs.version;

SuperSandro2000 · 2025-01-02T22:36:40Z

pkgs/by-name/am/amnezia-vpn/package.nix

+      src = fetchFromGitHub {
+        owner = "amnezia-vpn";
+        repo = "amnezia-xray-core";
+        rev = "v${finalAttrs.version}";


Suggested change

rev = "v${finalAttrs.version}";

tag = "v${finalAttrs.version}";

SuperSandro2000 · 2025-01-02T22:36:46Z

pkgs/by-name/am/amnezia-vpn/package.nix

+      src = fetchFromGitHub {
+        owner = "amnezia-vpn";
+        repo = "amnezia-tun2socks";
+        rev = "v${finalAttrs.version}";


Suggested change

rev = "v${finalAttrs.version}";

tag = "v${finalAttrs.version}";

LordGrimmauld · 2025-01-11T14:43:31Z

`nixpkgs-review` result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 367972

`x86_64-linux`

⏩ 2 packages blacklisted:

nixos-install-tools
tests.nixos-functions.nixos-test

✅ 1 package built:

amnezia-vpn

sund3RRR · 2025-01-14T19:39:05Z

@SuperSandro2000

LordGrimmauld · 2025-01-15T10:34:36Z

`nixpkgs-review` result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 367972

`x86_64-linux`

⏩ 1 package blacklisted:

nixos-install-tools

✅ 1 package built:

amnezia-vpn

LordGrimmauld

looks reasonable to me now

github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Dec 24, 2024

sund3RRR force-pushed the amneziaVPN-init branch 2 times, most recently from 7fb4d1f to 486afad Compare December 24, 2024 17:31

github-actions bot added 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Dec 24, 2024

sund3RRR force-pushed the amneziaVPN-init branch 2 times, most recently from 6011112 to f27aaab Compare December 24, 2024 17:42

sund3RRR force-pushed the amneziaVPN-init branch 3 times, most recently from 59a4f84 to a63f578 Compare December 24, 2024 18:09

ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1 labels Dec 25, 2024

sund3RRR force-pushed the amneziaVPN-init branch from a63f578 to db036a8 Compare December 25, 2024 08:02

github-actions bot removed the 10.rebuild-darwin: 1 label Dec 25, 2024

ofborg bot added the 10.rebuild-darwin: 1 label Dec 25, 2024

sund3RRR force-pushed the amneziaVPN-init branch 2 times, most recently from 3dd57b4 to b2b17e6 Compare December 26, 2024 20:38

sund3RRR force-pushed the amneziaVPN-init branch 2 times, most recently from 6bb9f59 to c67a69f Compare December 27, 2024 11:34

github-actions bot added 8.has: documentation This PR adds or changes documentation 8.has: changelog labels Dec 27, 2024

sund3RRR marked this pull request as ready for review December 27, 2024 11:37

sund3RRR changed the title ~~amneziaVPN: init at 4.8.2.3; nixos/programs/amneziaVPN: init~~ amnezia-vpn: init at 4.8.2.3; nixos/programs/amnezia-vpn: init Dec 27, 2024

github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin and removed 10.rebuild-darwin: 1-10 labels Dec 31, 2024

sund3RRR force-pushed the amneziaVPN-init branch from a6060d1 to 70aed45 Compare January 1, 2025 15:16

sund3RRR requested a review from K900 January 1, 2025 15:28

sund3RRR mentioned this pull request Jan 1, 2025

fix: rewrite linux router dns flusher amnezia-vpn/amnezia-client#1335

Merged

sund3RRR force-pushed the amneziaVPN-init branch from 70aed45 to 337dc1f Compare January 2, 2025 13:50

SuperSandro2000 reviewed Jan 2, 2025

View reviewed changes

pkgs/by-name/am/amnezia-vpn/package.nix Show resolved Hide resolved

SuperSandro2000 reviewed Jan 2, 2025

View reviewed changes

pkgs/by-name/am/amnezia-vpn/package.nix Outdated Show resolved Hide resolved

SuperSandro2000 reviewed Jan 2, 2025

View reviewed changes

pkgs/by-name/am/amnezia-vpn/package.nix Outdated Show resolved Hide resolved

SuperSandro2000 reviewed Jan 2, 2025

View reviewed changes

pkgs/by-name/am/amnezia-vpn/package.nix Outdated Show resolved Hide resolved

SuperSandro2000 reviewed Jan 2, 2025

View reviewed changes

sund3RRR force-pushed the amneziaVPN-init branch from 337dc1f to d859408 Compare January 3, 2025 08:48

sund3RRR requested a review from SuperSandro2000 January 3, 2025 08:51

sund3RRR force-pushed the amneziaVPN-init branch 2 times, most recently from 0a815ab to 8ff7bd9 Compare January 3, 2025 09:01

amneziaVPN: init at 4.8.2.3; nixos/programs/amneziaVPN: init

28d2336

sund3RRR force-pushed the amneziaVPN-init branch from 8ff7bd9 to 28d2336 Compare January 15, 2025 10:22

LordGrimmauld approved these changes Jan 15, 2025

View reviewed changes

SuperSandro2000 approved these changes Jan 15, 2025

View reviewed changes

SuperSandro2000 merged commit a0b256f into NixOS:master Jan 15, 2025
25 of 28 checks passed

h7x4 added the 8.has: module (new) This PR adds a module in `nixos/` label Jan 17, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

amnezia-vpn: init at 4.8.2.3; nixos/programs/amnezia-vpn: init #367972

amnezia-vpn: init at 4.8.2.3; nixos/programs/amnezia-vpn: init #367972

sund3RRR commented Dec 24, 2024 •

edited

Loading

sund3RRR commented Dec 24, 2024

sund3RRR commented Dec 25, 2024

sund3RRR commented Dec 26, 2024

sund3RRR commented Dec 26, 2024

nixos-discourse commented Dec 27, 2024

K900 commented Jan 1, 2025

sund3RRR commented Jan 1, 2025

SuperSandro2000 Jan 2, 2025

sund3RRR Jan 3, 2025

SuperSandro2000 Jan 2, 2025

sund3RRR Jan 3, 2025

LordGrimmauld Jan 11, 2025

LordGrimmauld Jan 14, 2025 •

edited

Loading

sund3RRR Jan 15, 2025

SuperSandro2000 Jan 2, 2025

SuperSandro2000 Jan 2, 2025

SuperSandro2000 Jan 2, 2025

LordGrimmauld commented Jan 11, 2025

sund3RRR commented Jan 14, 2025

LordGrimmauld commented Jan 15, 2025

LordGrimmauld left a comment

	rev = "refs/tags/${finalAttrs.version}";
	tag = finalAttrs.version;

	rev = "v${finalAttrs.version}";
	tag = "v${finalAttrs.version}";

amnezia-vpn: init at 4.8.2.3; nixos/programs/amnezia-vpn: init #367972

amnezia-vpn: init at 4.8.2.3; nixos/programs/amnezia-vpn: init #367972

Conversation

sund3RRR commented Dec 24, 2024 • edited Loading

Things done

sund3RRR commented Dec 24, 2024

sund3RRR commented Dec 25, 2024

sund3RRR commented Dec 26, 2024

sund3RRR commented Dec 26, 2024

nixos-discourse commented Dec 27, 2024

K900 commented Jan 1, 2025

sund3RRR commented Jan 1, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LordGrimmauld Jan 14, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

LordGrimmauld commented Jan 11, 2025

nixpkgs-review result

x86_64-linux

sund3RRR commented Jan 14, 2025

LordGrimmauld commented Jan 15, 2025

nixpkgs-review result

x86_64-linux

LordGrimmauld left a comment

Choose a reason for hiding this comment

sund3RRR commented Dec 24, 2024 •

edited

Loading

LordGrimmauld Jan 14, 2025 •

edited

Loading

`nixpkgs-review` result

`x86_64-linux`

`nixpkgs-review` result

`x86_64-linux`