fix pkgs dependency

master
vuko 2022-02-14 22:34:37 +01:00
parent 6d17840802
commit d635d08200
2 changed files with 9 additions and 5 deletions

View File

@ -1,12 +1,12 @@
{ pkgs ? import <nixpkgs> {} }:
{ gunicorn, flask, paho-mqtt, pyyaml, setuptools, buildPythonPackage }:
pkgs.python3Packages.buildPythonPackage {
buildPythonPackage {
pname = "lights-web";
version = "0.4.0";
src = ./.;
propagatedBuildInputs = with pkgs.python3Packages; [
propagatedBuildInputs = [
gunicorn flask paho-mqtt pyyaml setuptools
];
}

View File

@ -43,7 +43,7 @@ in {
ln -s ${paho}/src/paho-mqtt.js static/paho-mqtt.js
popd
'';
lights-web = pkgs.callPackage ./default.nix {};
lights-web = pkgs.python3Packages.callPackage ./default.nix {};
user = name;
python = pkgs.python3.withPackages (pp:[ lights-web pp.gunicorn ]);
@ -69,6 +69,7 @@ in {
users.users."${user}" = {
group = "users";
useDefaultShell = true;
isSystemUser = true;
};
systemd.services."${name}" = {
@ -93,9 +94,12 @@ in {
{
locations."/static/" = {
root = "${static-files}/";
extraConfig = ''
include ${pkgs.nginx}/conf/mime.types;
'';
};
locations."/" = {
proxyPass = "http://unix://${socket_dir}/web.sock";
proxyPass = "http://unix:${socket_dir}/web.sock";
extraConfig = ''
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;