swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

alerta-server: move to all-packages.nix and use buildPythonApplication

Browse source
This commit is contained in:
Robert Schütz 2021-02-06 11:36:59 +01:00
parent d0328678e9
commit 3fcd9361b5
4 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/monitoring/alerta.nix
View file

@ -95,7 +95,7 @@ in
ALERTA_SVR_CONF_FILE = alertaConf; ALERTA_SVR_CONF_FILE = alertaConf;
}; };
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.python36Packages.alerta-server}/bin/alertad run --port ${toString cfg.port} --host ${cfg.bind}"; ExecStart = "${pkgs.alerta-server}/bin/alertad run --port ${toString cfg.port} --host ${cfg.bind}";
User = "alerta"; User = "alerta";
Group = "alerta"; Group = "alerta";
}; };

16
pkgs/development/python-modules/alerta-server/default.nix → pkgs/servers/monitoring/alerta/default.nix
View file

@ -1,17 +1,17 @@
{ lib, buildPythonPackage, fetchPypi, pythonOlder { lib
, bcrypt, blinker, flask, flask-compress, flask-cors, mohawk, psycopg2, pyjwt, pymongo, python-dateutil, pytz, pyyaml, requests, requests-hawk, sentry-sdk , python3
}: }:
buildPythonPackage rec { python3.pkgs.buildPythonApplication rec {
pname = "alerta-server"; pname = "alerta-server";
version = "8.3.3"; version = "8.3.3";
src = fetchPypi { src = python3.pkgs.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "a2713a31c6e326c774a3ee0328f424f944b951935ff1b893a4a66598d61c5a97"; sha256 = "a2713a31c6e326c774a3ee0328f424f944b951935ff1b893a4a66598d61c5a97";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = with python3.pkgs; [
bcrypt bcrypt
blinker blinker
flask flask
@ -31,11 +31,7 @@ buildPythonPackage rec {
doCheck = false; # We can't run the tests from Nix, because they rely on the presence of a working MongoDB server doCheck = false; # We can't run the tests from Nix, because they rely on the presence of a working MongoDB server
postInstall = '' disabled = python3.pythonOlder "3.6";
wrapProgram $out/bin/alertad --prefix PYTHONPATH : "$PYTHONPATH"
'';
disabled = pythonOlder "3.5";
meta = with lib; { meta = with lib; {
homepage = "https://alerta.io"; homepage = "https://alerta.io";

2
pkgs/top-level/all-packages.nix
View file

@ -17733,6 +17733,8 @@ in
adguardhome = callPackage ../servers/adguardhome {}; adguardhome = callPackage ../servers/adguardhome {};
alerta-server = callPackage ../servers/monitoring/alerta { };
apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { };
apacheHttpd = pkgs.apacheHttpd_2_4; apacheHttpd = pkgs.apacheHttpd_2_4;

2
pkgs/top-level/python-packages.nix
View file

@ -324,8 +324,6 @@ in {
alerta = callPackage ../development/python-modules/alerta { }; alerta = callPackage ../development/python-modules/alerta { };
alerta-server = callPackage ../development/python-modules/alerta-server { };
algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { }; algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { };
allpairspy = callPackage ../development/python-modules/allpairspy { }; allpairspy = callPackage ../development/python-modules/allpairspy { };