summaryrefslogtreecommitdiffstats
path: root/makefu/5pkgs/default.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-07-07 23:33:49 +0200
committerlassulus <lass@aidsballs.de>2016-07-07 23:33:49 +0200
commit18ff162945aa66192e89b5b57c49e4b4fe122f64 (patch)
treec99bc60647988323c3054add53dc538fe78e9861 /makefu/5pkgs/default.nix
parentf4b2262c7eb07a4b66a9352e9851e9e94c13b540 (diff)
parentfa2eb245f30df9f69720ec5853b2c15dd67cdf28 (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/5pkgs/default.nix')
-rw-r--r--makefu/5pkgs/default.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index bb6290af2..f6a6b674b 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -9,12 +9,15 @@ in
alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
awesomecfg = callPackage ./awesomecfg {};
+ bintray-upload = callPackage ./bintray-upload {};
mycube-flask = callPackage ./mycube-flask {};
nodemcu-uploader = callPackage ./nodemcu-uploader {};
tw-upload-plugin = callPackage ./tw-upload-plugin {};
inherit (callPackage ./devpi {}) devpi-web devpi-server;
skytraq-logger = callPackage ./skytraq-logger {};
taskserver = callPackage ./taskserver {};
- bintray-upload = callPackage ./bintray-upload {};
+ ps3netsrv = callPackage ./ps3netsrv {};
+ honeyd = callPackage ./honeyd {};
+ farpd = callPackage ./farpd {};
};
}
[cgit] Unable to lock slot /tmp/cgit/f1300000.lock: No such file or directory (2)