diff options
| author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2015-05-26 11:39:06 +0100 |
|---|---|---|
| committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2015-05-26 11:39:06 +0100 |
| commit | 5c401ea5eea60707029b18ab576c59ca2ed7a75a (patch) | |
| tree | fc847448685821ebe96d91f6a00bbcdc4b6a5397 /pkgs/top-level | |
| parent | 1113efec5e588738fc8a68315193a791973ca28c (diff) | |
| parent | 3ddaf0c32ad6961cbc5e1594fd08f04e0f7dfbf3 (diff) | |
| download | nixlib-5c401ea5eea60707029b18ab576c59ca2ed7a75a.tar nixlib-5c401ea5eea60707029b18ab576c59ca2ed7a75a.tar.gz nixlib-5c401ea5eea60707029b18ab576c59ca2ed7a75a.tar.bz2 nixlib-5c401ea5eea60707029b18ab576c59ca2ed7a75a.tar.lz nixlib-5c401ea5eea60707029b18ab576c59ca2ed7a75a.tar.xz nixlib-5c401ea5eea60707029b18ab576c59ca2ed7a75a.tar.zst nixlib-5c401ea5eea60707029b18ab576c59ca2ed7a75a.zip | |
Merge branch 'bitmeter-master' of https://github.com/magnetophon/nixpkgs
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e416d97b1676..888b8bea7819 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10435,6 +10435,8 @@ let bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { }; + bitmeter = callPackage ../applications/audio/bitmeter { }; + blender = callPackage ../applications/misc/blender { python = python34; }; |