From 8824e5f5b0017552a7f1510e00d3bfc20ccb0d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?= Date: Sat, 12 Oct 2024 01:22:05 +0300 Subject: [PATCH] protonvpn-gui_legacy: deprecate application The source code for this project was removed a while ago and there is no method to build this from scratch anymore. The erase decission was probably done by the Proton developers as they are currently focussing all efforts on the protonvpn-gui app. --- .../networking/protonvpn-gui/legacy.nix | 81 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 pkgs/applications/networking/protonvpn-gui/legacy.nix diff --git a/pkgs/applications/networking/protonvpn-gui/legacy.nix b/pkgs/applications/networking/protonvpn-gui/legacy.nix deleted file mode 100644 index 19a2fe7288e9..000000000000 --- a/pkgs/applications/networking/protonvpn-gui/legacy.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ - lib, - buildPythonApplication, - fetchFromGitHub, - setuptools, - wrapGAppsHook3, - gdk-pixbuf, - glib-networking, - gobject-introspection, - imagemagick, - librsvg, - pango, - python3, - webkitgtk, - # Python libs - protonvpn-nm-lib, - psutil, - # Optionals - withIndicator ? true, - libappindicator-gtk3, -}: - -buildPythonApplication rec { - pname = "protonvpn-gui"; - version = "1.12.0"; - pyproject = true; - - src = fetchFromGitHub { - owner = "ProtonVPN"; - repo = "linux-app"; - rev = "refs/tags/${version}"; - sha256 = "sha256-MPS4d/yNkccsc/j85h7/4k4xL8uSCvhj/9JWPa7ezLY="; - }; - - nativeBuildInputs = [ - gdk-pixbuf - gobject-introspection - imagemagick - setuptools - wrapGAppsHook3 - ]; - - propagatedBuildInputs = [ - glib-networking # needed for the login captcha - protonvpn-nm-lib - psutil - ]; - - buildInputs = [ - librsvg - pango - webkitgtk - ] ++ lib.optionals withIndicator [ libappindicator-gtk3 ]; - - postInstall = '' - # Setting icons - for size in 16 32 48 64 72 96 128 192 512 1024; do - mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - convert -resize $size'x'$size \ - protonvpn_gui/assets/icons/protonvpn-logo.png \ - $out/share/icons/hicolor/$size'x'$size/apps/protonvpn.png - done - - install -Dm644 protonvpn.desktop -t $out/share/applications/ - chmod 644 $out/${python3.sitePackages}/protonvpn_gui/assets/icons/plus-server.png - substituteInPlace $out/share/applications/protonvpn.desktop \ - --replace 'protonvpn-logo' protonvpn - ''; - - # Project has a dummy test - doCheck = false; - - meta = with lib; { - description = "Official ProtonVPN Linux app"; - homepage = "https://github.com/ProtonVPN/linux-app"; - maintainers = [ ]; - license = licenses.gpl3Plus; - mainProgram = "protonvpn"; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dc7f0f6fc1ae..02040de3cab2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1325,6 +1325,7 @@ mapAliases { protobuf3_23 = protobuf_23; protobuf3_21 = protobuf_21; protonup = protonup-ng; # Added 2022-11-06 + protonvpn-gui_legacy = throw "protonvpn-gui_legacy source code was removed from upstream. Use protonvpn-gui instead."; # Added 2024-10-12 proxmark3-rrg = proxmark3; # Added 2023-07-25 proxmark3-unstable = throw "removed in favor of rfidresearchgroup fork"; # Added 2023-07-25 psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f482f2e6503..ed8c04cabb97 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31991,7 +31991,6 @@ with pkgs; protonvpn-cli_2 = python3Packages.callPackage ../applications/networking/protonvpn-cli/2.nix { }; protonvpn-gui = python3Packages.callPackage ../applications/networking/protonvpn-gui { }; - protonvpn-gui_legacy = python3Packages.callPackage ../applications/networking/protonvpn-gui/legacy.nix { }; ps2client = callPackage ../applications/networking/ps2client { };