Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ed6e427e9040
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 40bef249f19c
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Jan 16, 2020

  1. protonvpn-cli-ng: init at 2.2.0

    @jtcoolen
    jtcoolen committed Jan 16, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    jtcoolen Julien Coolen
    GPG key ID: 19642151C218F6F5
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b45c4d2 View commit details

Commits on Jan 17, 2020

  1. Merge pull request #77407 from jtcoolen/protonvpn-cli-ng 

    protonvpn-cli-ng: init at 2.2.0
    @worldofpeace
    worldofpeace authored Jan 17, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    40bef24 View commit details
Showing with 46 additions and 0 deletions.
  1. +10 −0 maintainers/maintainer-list.nix
  2. +34 −0 pkgs/applications/networking/protonvpn-cli-ng/default.nix
  3. +2 −0 pkgs/top-level/all-packages.nix
10 changes: 10 additions & 0 deletions maintainers/maintainer-list.nix
View file
Original file line number Diff line number Diff line change
@@ -3510,6 +3510,16 @@
githubId = 4611077;
name = "Raymond Gauthier";
};
jtcoolen = {
email = "jtcoolen@pm.me";
name = "Julien Coolen";
github = "jtcoolen";
githubId = 54635632;
keys = [{
longkeyid = "rsa4096/0x19642151C218F6F5";
fingerprint = "4C68 56EE DFDA 20FB 77E8 9169 1964 2151 C218 F6F5";
}];
};
jtobin = {
email = "jared@jtobin.io";
github = "jtobin";
34 changes: 34 additions & 0 deletions pkgs/applications/networking/protonvpn-cli-ng/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{ stdenv, lib, fetchFromGitHub, python3Packages, openvpn, dialog }:

python3Packages.buildPythonApplication rec {
name = "protonvpn-cli-ng";
version = "2.2.0";

src = fetchFromGitHub {
owner = "protonvpn";
repo = "protonvpn-cli-ng";
rev = "v${version}";
sha256 = "11fvnnr5p3qdc4y10815jnydcjvxlxwkkq9kvaajg0yszq84rwkz";
};

propagatedBuildInputs = (with python3Packages; [
requests
docopt
setuptools
pythondialog
]) ++ [
dialog
openvpn
];

# No tests
doCheck = false;

meta = with stdenv.lib; {
description = "Linux command-line client for ProtonVPN";
homepage = "https://github.com/protonvpn/protonvpn-cli-ng";
maintainers = [ maintainers.jtcoolen ];
license = licenses.gpl3;
platforms = platforms.unix;
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -20886,6 +20886,8 @@ in

protonvpn-cli = callPackage ../applications/networking/protonvpn-cli { };

protonvpn-cli-ng = callPackage ../applications/networking/protonvpn-cli-ng { };

ps2client = callPackage ../applications/networking/ps2client { };

psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { };