Unverified Commit 7155128b authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents abf70741 d0899728

.git-blame-ignore-revs

+3 −0
Original line number Diff line number Diff line
@@ -300,3 +300,6 @@ f7611cad5154a9096faa26d156a4079577bfae17 
90e7159c559021ac4f4cc1222000f08a91feff69 # !autorebase nix-shell --run treefmt

c283f32d296564fd649ef3ed268c1f1f7b199c49 # !autorebase nix-shell --run treefmt

91a8fee3aaf79348aa2dc1552a29fc1b786c5133 # !autorebase nix-shell --run treefmt



# aliases: keep-sorted

48ce0739044bd6eba83c3a43bd4ad1046399cdad # !autorebase nix-shell --run treefmt

doc/release-notes/rl-2511.section.md

+3 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ 


- `base16-builder` node package has been removed due to lack of upstream maintenance.



- The default glibc ELF ABI for the powerpc64-linux platform has been changed from ELFv2 back to ELFv1, due to the latter having less remaining issues when bootstrapping & building Nixpkgs packages on hardware.

  If glibc ELFv2 is desired, use a fuller target triplet like `powerpc64-unknown-linux-gnuabielfv2` or the provided `ppc64-elfv2` platform example.



- `python3Packages.bjoern` has been removed, as the upstream is unmaintained and it depends on a 14-year-old version of http-parser with numerous vulnerabilities.



- `buildGoModule` removes the compatibility layer of `CGO_ENABLED` not specified via `env`.

maintainers/maintainer-list.nix

+12 −0
Original line number Diff line number Diff line
@@ -5960,6 +5960,12 @@ 
    githubId = 49904992;

    name = "Dawid Sowa";

  };

  dawnofmidnight = {

    email = "dawnofmidnight@duck.com";

    github = "dawnofmidnight";

    githubId = 78233879;

    name = "whispers";

  };

  dawoox = {

    email = "contact@antoinebellanger.fr";

    github = "Dawoox";
@@ -29155,6 +29161,12 @@ 
    githubId = 332534;

    name = "Zach Shipko";

  };

  zstg = {

    email = "zestig@duck.com";

    github = "zstg";

    githubId = 69384921;

    name = "ZeStig";

  };

  ztzg = {

    email = "dd@crosstwine.com";

    github = "ztzg";

pkgs/applications/networking/protonvpn-cli/2.nix

deleted100644 → 0
+0 −57
Original line number Diff line number Diff line 
{

  lib,

  buildPythonApplication,

  fetchFromGitHub,

  pythonOlder,

  requests,

  docopt,

  pythondialog,

  jinja2,

  distro,

  dialog,

  iptables,

  openvpn,

}:



buildPythonApplication rec {

  pname = "protonvpn-cli_2";

  version = "2.2.12";

  format = "setuptools";



  disabled = pythonOlder "3.5";



  src = fetchFromGitHub {

    owner = "Rafficer";

    repo = "linux-cli-community";

    # There is a tag and branch with the same name

    rev = "refs/tags/v${version}";

    sha256 = "sha256-vNbqjdkIRK+MkYRKUUe7W5Ytc1PU1t5ZLr9fPDOZXUs=";

  };



  propagatedBuildInputs = [

    requests

    docopt

    pythondialog

    jinja2

    distro

    dialog

    openvpn

    iptables

  ];



  # No tests

  doCheck = false;



  meta = with lib; {

    description = "Linux command-line client for ProtonVPN using Openvpn";

    homepage = "https://github.com/Rafficer/linux-cli-community";

    maintainers = with maintainers; [

      jtcoolen

      jefflabonte

      shamilton

    ];

    license = licenses.gpl3Plus;

    platforms = platforms.linux;

    mainProgram = "protonvpn";

  };

}

pkgs/applications/networking/protonvpn-cli/default.nix

deleted100644 → 0
+0 −60
Original line number Diff line number Diff line 
{

  lib,

  buildPythonApplication,

  pythonOlder,

  fetchFromGitHub,

  protonvpn-nm-lib,

  pythondialog,

  dialog,

  wrapGAppsNoGuiHook,

  gobject-introspection,

  glib,

}:



buildPythonApplication rec {

  pname = "protonvpn-cli";

  version = "3.13.0";

  format = "setuptools";



  disabled = pythonOlder "3.5";



  src = fetchFromGitHub {

    owner = "protonvpn";

    repo = "linux-cli";

    tag = version;

    sha256 = "sha256-KhfogC23i7THe6YZJ6Sy1+q83vZupHsS69NurHCeo8I=";

  };



  nativeBuildInputs = [

    wrapGAppsNoGuiHook

    gobject-introspection

  ];



  buildInputs = [

    glib

  ];



  propagatedBuildInputs = [

    protonvpn-nm-lib

    pythondialog

    dialog

  ];



  dontWrapGApps = true;



  makeWrapperArgs = [

    "\${gappsWrapperArgs[@]}"

  ];



  # Project has a dummy test

  doCheck = false;



  meta = with lib; {

    description = "Linux command-line client for ProtonVPN";

    homepage = "https://github.com/protonvpn/linux-cli";

    maintainers = [ ];

    license = licenses.gpl3Plus;

    platforms = platforms.linux;

    mainProgram = "protonvpn-cli";

  };

}