From 84a9cc3dfe232f252136d0e7a4ba1caa626b7809 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 5 Apr 2018 14:42:46 +0200
Subject: Use upstream uwsgi

---
 ymir.nix | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/ymir.nix b/ymir.nix
index 02670e33..36db5830 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -69,21 +69,21 @@ in rec {
           extraModules = [prosodyAuth];
           extraLibs = [luaPam luaPosix luaSha2];
         });
-      uwsgi = pkgs.callPackage ./customized/uwsgi.nix {
-        extraPlugins = {
-          cgi = {
-            name = "cgi";
-            interpreter = pkgs.python3.interpreter;
-            path = "plugins/cgi";
-            inputs = [ pkgs.python3 ];
-            install = ''
-              ${pkgs.python3.executable} -m compileall $out/${pkgs.python3.sitePackages}/
-              ${pkgs.python3.executable} -O -m compileall $out/${pkgs.python3.sitePackages}/
-            '';
-          };
-        };
-        plugins = [];
-      };
+      # uwsgi = pkgs.callPackage ./customized/uwsgi.nix {
+      #   extraPlugins = {
+      #     cgi = {
+      #       name = "cgi";
+      #       interpreter = pkgs.python3.interpreter;
+      #       path = "plugins/cgi";
+      #       inputs = [ pkgs.python3 ];
+      #       install = ''
+      #         ${pkgs.python3.executable} -m compileall $out/${pkgs.python3.sitePackages}/
+      #         ${pkgs.python3.executable} -O -m compileall $out/${pkgs.python3.sitePackages}/
+      #       '';
+      #     };
+      #   };
+      #   plugins = [];
+      # };
       cgit = pkgs.stdenv.lib.overrideDerivation pkgs.cgit (oldAttrs : {
         buildInputs = oldAttrs.buildInputs ++ [
           pkgs.perl
-- 
cgit v1.2.3