From f56be70f3f4549c9dac929cc34b308dc78e6d40c Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:42 +0000 Subject: [PATCH] uwsgi: move defaults to package file --- pkgs/servers/uwsgi/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 91053019ac12..99eac2760dd1 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchurl, pkgconfig, jansson, pcre # plugins: list of strings, eg. [ "python2" "python3" ] -, plugins -, pam, withPAM ? false -, systemd, withSystemd ? false +, plugins ? [] +, pam, withPAM ? stdenv.isLinux +, systemd, withSystemd ? stdenv.isLinux , python2, python3, ncurses , ruby, php-embed, mysql }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9e1b3c61fb6..d1f0749075a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5916,11 +5916,7 @@ in usync = callPackage ../applications/misc/usync { }; - uwsgi = callPackage ../servers/uwsgi { - plugins = []; - withPAM = stdenv.isLinux; - withSystemd = stdenv.isLinux; - }; + uwsgi = callPackage ../servers/uwsgi { }; vacuum = callPackage ../applications/networking/instant-messengers/vacuum {};