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 | f67a4c5a6a35a271cc9ab466770a2037af35c9c2 (patch) | |
| tree | 182d7f18d18a46e6759fd713e83db139ccf975ef /5pkgs/default.nix | |
| parent | 7344b9df191c74466b6b9f9e032b0e50d867e701 (diff) | |
| parent | 5a052128e8e3eab391f00b29445335485062bbd7 (diff) | |
Merge branch 'master' of gum:stockholm
Diffstat (limited to '5pkgs/default.nix')
| -rw-r--r-- | 5pkgs/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/5pkgs/default.nix b/5pkgs/default.nix index d09d4a6e8..9cd2629de 100644 --- a/5pkgs/default.nix +++ b/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 {}; }; } |