vuko/lights-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix pkgs dependency

Browse source
This commit is contained in:
vuko 2022-02-14 22:34:37 +01:00
parent 6d17840802
commit d635d08200
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
default.nix
View file

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

8
service.nix
View file

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