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