summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2018-06-14 09:14:18 +0200
committerGitHub <noreply@github.com>2018-06-14 09:14:18 +0200
commitf784a8d925ba02ce8972db7eaeb844eb15d624ab (patch)
tree7ed967926e34bd2890988823b78431e96056fc9b /pkgs
parenta4e59caa30bb208c8a5ea486a4ff56e1777402ed (diff)
parent4bba2bd98e8a8c5172c45f508df95242b9c6da86 (diff)
downloadnixlib-f784a8d925ba02ce8972db7eaeb844eb15d624ab.tar
nixlib-f784a8d925ba02ce8972db7eaeb844eb15d624ab.tar.gz
nixlib-f784a8d925ba02ce8972db7eaeb844eb15d624ab.tar.bz2
nixlib-f784a8d925ba02ce8972db7eaeb844eb15d624ab.tar.lz
nixlib-f784a8d925ba02ce8972db7eaeb844eb15d624ab.tar.xz
nixlib-f784a8d925ba02ce8972db7eaeb844eb15d624ab.tar.zst
nixlib-f784a8d925ba02ce8972db7eaeb844eb15d624ab.zip
Merge pull request #41968 from aneeshusa/enable-using-klaus-with-uwsgi
Enable using klaus with uwsgi
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/klaus/default.nix (renamed from pkgs/servers/web-apps/klaus/default.nix)2
-rw-r--r--pkgs/top-level/all-packages.nix2
-rw-r--r--pkgs/top-level/python-packages.nix2
3 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/servers/web-apps/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix
index 81d1e57e7a04..0740cfa84bb7 100644
--- a/pkgs/servers/web-apps/klaus/default.nix
+++ b/pkgs/development/python-modules/klaus/default.nix
@@ -1,6 +1,6 @@
 { lib, python, fetchFromGitHub }:
 
-python.pkgs.buildPythonApplication rec {
+python.pkgs.buildPythonPackage rec {
   pname = "klaus";
   version = "1.2.2";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dcfc3646bcc6..cf5f480ec3a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1339,7 +1339,7 @@ with pkgs;
 
   kisslicer = callPackage ../tools/misc/kisslicer { };
 
-  klaus = callPackage ../servers/web-apps/klaus { };
+  klaus = with pythonPackages; toPythonApplication klaus;
 
   lcdproc = callPackage ../servers/monitoring/lcdproc { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9f0a0f45b12d..a3a80f998f7a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6929,6 +6929,8 @@ in {
 
   kiwisolver = callPackage ../development/python-modules/kiwisolver { };
 
+  klaus = callPackage ../development/python-modules/klaus {};
+
   klein = callPackage ../development/python-modules/klein { };
 
   koji = callPackage ../development/python-modules/koji { };