ppp: adopt, cleanups, add systemd sd-notify & PAM support (#366940)

authored by 7c6f434c and committed by GitHub cd6c393d e7c2205b

+26 -15
+5
nixos/tests/pppd.nix
··· 5 5 mode = "0640"; 6 6 }; 7 7 in 8 + { pkgs, ... }: 8 9 { 9 10 name = "pppd"; 11 + 12 + meta = with pkgs.lib.maintainers; { 13 + maintainers = [ stv0g ]; 14 + }; 10 15 11 16 nodes = { 12 17 server =
+21 -15
pkgs/by-name/pp/ppp/package.nix
··· 1 - { lib 2 - , stdenv 3 - , fetchFromGitHub 4 - , libpcap 5 - , libxcrypt 6 - , pkg-config 7 - , autoreconfHook 8 - , openssl 9 - , bash 10 - , nixosTests 1 + { 2 + autoreconfHook, 3 + bash, 4 + fetchFromGitHub, 5 + lib, 6 + libpcap, 7 + libxcrypt, 8 + linux-pam, 9 + nixosTests, 10 + openssl, 11 + pkg-config, 12 + stdenv, 13 + systemdMinimal, 11 14 }: 12 15 13 16 stdenv.mkDerivation rec { ··· 25 28 "--localstatedir=/var" 26 29 "--sysconfdir=/etc" 27 30 "--with-openssl=${openssl.dev}" 31 + "--enable-systemd" 28 32 ]; 29 33 30 34 nativeBuildInputs = [ ··· 33 37 ]; 34 38 35 39 buildInputs = [ 40 + bash 36 41 libpcap 37 42 libxcrypt 43 + linux-pam 38 44 openssl 39 - bash 45 + systemdMinimal 40 46 ]; 41 47 42 48 postPatch = '' ··· 72 78 inherit (nixosTests) pppd; 73 79 }; 74 80 75 - meta = with lib; { 81 + meta = { 76 82 homepage = "https://ppp.samba.org"; 77 83 description = "Point-to-point implementation to provide Internet connections over serial lines"; 78 - license = with licenses; [ 84 + license = with lib.licenses; [ 79 85 bsdOriginal 80 86 publicDomain 81 87 gpl2Only 82 88 lgpl2 83 89 ]; 84 - platforms = platforms.linux; 85 - maintainers = [ ]; 90 + platforms = lib.platforms.linux; 91 + maintainers = with lib.maintainers; [ stv0g ]; 86 92 }; 87 93 }