summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2017-02-12 23:22:53 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2017-02-12 23:22:53 +0100
commit97c83f6733817691c02dbb8bed8b884c401283fd (patch)
tree1650cab7b30deabf9db3f3fa965ee0367ab99390
parent1bb2403068c88d1df2f728ea43f74c91b178c1ee (diff)
downloadnixos-97c83f6733817691c02dbb8bed8b884c401283fd.tar
nixos-97c83f6733817691c02dbb8bed8b884c401283fd.tar.gz
nixos-97c83f6733817691c02dbb8bed8b884c401283fd.tar.bz2
nixos-97c83f6733817691c02dbb8bed8b884c401283fd.tar.xz
nixos-97c83f6733817691c02dbb8bed8b884c401283fd.zip
Revert "ditto"
This reverts commit 1bb2403068c88d1df2f728ea43f74c91b178c1ee.
-rw-r--r--ymir.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/ymir.nix b/ymir.nix
index 309ebdb3..ecc14a44 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -48,13 +48,13 @@ in rec {
48 nixpkgs.config.packageOverrides = pkgs: 48 nixpkgs.config.packageOverrides = pkgs:
49 rec { 49 rec {
50 prosody = pkgs.callPackage ./customized/prosody.nix ({ 50 prosody = pkgs.callPackage ./customized/prosody.nix ({
51 inherit (lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib; 51 inherit (pkgs.lua51Packages) luasocket luasec luaexpat luafilesystem luabitop luaevent luazlib;
52 lua5 = pkgs.lua5_1; 52 lua5 = pkgs.lua5_1;
53 communityModules = ["mod_carbons" "mod_reload_modules"]; 53 communityModules = ["mod_carbons" "mod_reload_modules"];
54 extraModules = [prosodyAuth]; 54 extraModules = [prosodyAuth];
55 extraLibs = [luaPam luaPosix luaSha2]; 55 extraLibs = [luaPam luaPosix luaSha2];
56 }); 56 });
57 lua51Packages = pkgs.lua51Packages // { luasec = pkgs.lua5_sec; }; 57 lua51Packages = lua51Packages \\ { luasec = pkgs.lua5_sec; };
58 uwsgi = pkgs.callPackage ./customized/uwsgi.nix { 58 uwsgi = pkgs.callPackage ./customized/uwsgi.nix {
59 extraPlugins = { 59 extraPlugins = {
60 cgi = { 60 cgi = {