summaryrefslogtreecommitdiffstats
path: root/makefu/5pkgs/default.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-05-09 11:27:06 +0200
committerlassulus <lass@aidsballs.de>2016-05-09 11:27:06 +0200
commite7528ccc2f366df381d6436ae2ad6781a9a0ace3 (patch)
tree59d65c08da8fdd297fe02ab8bb1486f420b4a17f /makefu/5pkgs/default.nix
parentfb87c76112b1c4c8d48de8df78b5f46f2b750bdf (diff)
parent56ca7859fab1ad3c1a0a7b5ebf10140b218a60be (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/5pkgs/default.nix')
-rw-r--r--makefu/5pkgs/default.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index fff92725..9cd2629d 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -12,6 +12,7 @@ in
mycube-flask = callPackage ./mycube-flask {};
nodemcu-uploader = callPackage ./nodemcu-uploader {};
tw-upload-plugin = callPackage ./tw-upload-plugin {};
+ inherit (callPackage ./devpi {}) devpi-web devpi-server;
taskserver = callPackage ./taskserver {};
};
}