ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-21 12:38:41 +03:00
Code Issues Projects Releases Wiki Activity

freeradius: add rest module and multiple outputs

Browse Source
This commit is contained in:
Franz Pletz 2018-08-01 02:19:25 +02:00
parent b0003a1680
commit b5477ab37b
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/module-list.nix
View File

@ -492,7 +492,6 @@
./services/networking/flannel.nix ./services/networking/flannel.nix
./services/networking/flashpolicyd.nix ./services/networking/flashpolicyd.nix
./services/networking/freenet.nix ./services/networking/freenet.nix
./services/networking/freeradius.nix
./services/networking/gale.nix ./services/networking/gale.nix
./services/networking/gateone.nix ./services/networking/gateone.nix
./services/networking/gdomap.nix ./services/networking/gdomap.nix

13
pkgs/servers/freeradius/default.nix
View File

@ -21,6 +21,8 @@
, withYubikey ? false , withYubikey ? false
, collectd , collectd
, withCollectd ? false , withCollectd ? false
, curl
, withRest ? false
}: }:
assert withSqlite -> sqlite != null; assert withSqlite -> sqlite != null;
@ -32,6 +34,7 @@ assert withRedis -> hiredis != null;
assert withMysql -> mysql != null; assert withMysql -> mysql != null;
assert withYubikey -> libyubikey != null; assert withYubikey -> libyubikey != null;
assert withCollectd -> collectd != null; assert withCollectd -> collectd != null;
assert withRest -> curl != null && withJson;
## TODO: include windbind optionally (via samba?) ## TODO: include windbind optionally (via samba?)
## TODO: include oracle optionally ## TODO: include oracle optionally
@ -59,11 +62,13 @@ stdenv.mkDerivation rec {
++ optional withMysql mysql.connector-c ++ optional withMysql mysql.connector-c
++ optional withJson json_c ++ optional withJson json_c
++ optional withYubikey libyubikey ++ optional withYubikey libyubikey
++ optional withCollectd collectd; ++ optional withCollectd collectd
++ optional withRest curl;
configureFlags = [ configureFlags = [
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--localstatedir=/var" "--localstatedir=/var"
] ++ optional (!linkOpenssl) "--with-openssl=no"; ] ++ optional (!linkOpenssl) "--with-openssl=no";
postPatch = '' postPatch = ''
@ -75,6 +80,8 @@ stdenv.mkDerivation rec {
"localstatedir=\${TMPDIR}" "localstatedir=\${TMPDIR}"
]; ];
outputs = [ "out" "dev" "man" "doc" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://freeradius.org/; homepage = https://freeradius.org/;
description = "A modular, high performance free RADIUS suite"; description = "A modular, high performance free RADIUS suite";