diff options
author | makefu <makefu@nixos.dev> | 2016-05-02 16:08:30 +0200 |
---|---|---|
committer | makefu <makefu@nixos.dev> | 2016-05-02 16:08:30 +0200 |
commit | 64aa4f6912fb7425d8063e5d143f59c43fb31b8f (patch) | |
tree | 07fe7c386d32bd5e1375a7d01f623cd357a1d09d /makefu/5pkgs/default.nix | |
parent | 3f77b6c89f4a3a28d62e9117712481489ac56fa1 (diff) | |
parent | 6f4bc4b34c3cbac56f6a23740dca566980823990 (diff) |
Merge branch 'master' of gum:stockholm
Diffstat (limited to 'makefu/5pkgs/default.nix')
-rw-r--r-- | makefu/5pkgs/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix index d09d4a6e8..9cd2629de 100644 --- a/makefu/5pkgs/default.nix +++ b/makefu/5pkgs/default.nix @@ -9,9 +9,10 @@ in alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";}; alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";}; awesomecfg = callPackage ./awesomecfg {}; - nodemcu-uploader = callPackage ./nodemcu-uploader {}; 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 {}; }; } |