diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2018-04-05 14:42:46 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2018-04-05 14:42:46 +0200 |
| commit | 84a9cc3dfe232f252136d0e7a4ba1caa626b7809 (patch) | |
| tree | ecf7433928eeb5a458618aa289c70e2cfad5d999 | |
| parent | 76cf63fa231a63bbf72b6325a4cfba81f21c992f (diff) | |
| download | nixos-84a9cc3dfe232f252136d0e7a4ba1caa626b7809.tar nixos-84a9cc3dfe232f252136d0e7a4ba1caa626b7809.tar.gz nixos-84a9cc3dfe232f252136d0e7a4ba1caa626b7809.tar.bz2 nixos-84a9cc3dfe232f252136d0e7a4ba1caa626b7809.tar.xz nixos-84a9cc3dfe232f252136d0e7a4ba1caa626b7809.zip | |
Use upstream uwsgi
| -rw-r--r-- | ymir.nix | 30 |
1 files changed, 15 insertions, 15 deletions
| @@ -69,21 +69,21 @@ in rec { | |||
| 69 | extraModules = [prosodyAuth]; | 69 | extraModules = [prosodyAuth]; |
| 70 | extraLibs = [luaPam luaPosix luaSha2]; | 70 | extraLibs = [luaPam luaPosix luaSha2]; |
| 71 | }); | 71 | }); |
| 72 | uwsgi = pkgs.callPackage ./customized/uwsgi.nix { | 72 | # uwsgi = pkgs.callPackage ./customized/uwsgi.nix { |
| 73 | extraPlugins = { | 73 | # extraPlugins = { |
| 74 | cgi = { | 74 | # cgi = { |
| 75 | name = "cgi"; | 75 | # name = "cgi"; |
| 76 | interpreter = pkgs.python3.interpreter; | 76 | # interpreter = pkgs.python3.interpreter; |
| 77 | path = "plugins/cgi"; | 77 | # path = "plugins/cgi"; |
| 78 | inputs = [ pkgs.python3 ]; | 78 | # inputs = [ pkgs.python3 ]; |
| 79 | install = '' | 79 | # install = '' |
| 80 | ${pkgs.python3.executable} -m compileall $out/${pkgs.python3.sitePackages}/ | 80 | # ${pkgs.python3.executable} -m compileall $out/${pkgs.python3.sitePackages}/ |
| 81 | ${pkgs.python3.executable} -O -m compileall $out/${pkgs.python3.sitePackages}/ | 81 | # ${pkgs.python3.executable} -O -m compileall $out/${pkgs.python3.sitePackages}/ |
| 82 | ''; | 82 | # ''; |
| 83 | }; | 83 | # }; |
| 84 | }; | 84 | # }; |
| 85 | plugins = []; | 85 | # plugins = []; |
| 86 | }; | 86 | # }; |
| 87 | cgit = pkgs.stdenv.lib.overrideDerivation pkgs.cgit (oldAttrs : { | 87 | cgit = pkgs.stdenv.lib.overrideDerivation pkgs.cgit (oldAttrs : { |
| 88 | buildInputs = oldAttrs.buildInputs ++ [ | 88 | buildInputs = oldAttrs.buildInputs ++ [ |
| 89 | pkgs.perl | 89 | pkgs.perl |