diff options
| author | Shea Levy <shea@shealevy.com> | 2017-06-07 12:24:42 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2017-06-07 12:24:42 -0400 |
| commit | 5365166a5dc65bcd8670ba426a8fd80735f7f591 (patch) | |
| tree | aabf36dda726f636622a6aeb85b3bd84f4647fe6 /pkgs/top-level | |
| parent | db0235ce765df9741e9d99777e877a3100a30f1d (diff) | |
| parent | 7179b0119981750d7b72b092587a16544774ac92 (diff) | |
| download | nixlib-5365166a5dc65bcd8670ba426a8fd80735f7f591.tar nixlib-5365166a5dc65bcd8670ba426a8fd80735f7f591.tar.gz nixlib-5365166a5dc65bcd8670ba426a8fd80735f7f591.tar.bz2 nixlib-5365166a5dc65bcd8670ba426a8fd80735f7f591.tar.lz nixlib-5365166a5dc65bcd8670ba426a8fd80735f7f591.tar.xz nixlib-5365166a5dc65bcd8670ba426a8fd80735f7f591.tar.zst nixlib-5365166a5dc65bcd8670ba426a8fd80735f7f591.zip | |
Merge branch 'zoom-us' of git://github.com/danbst/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 9fbad23713d6..2a6b76580ec2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16788,6 +16788,8 @@ with pkgs; zim = callPackage ../applications/office/zim { }; + zoom-us = callPackage ../applications/networking/instant-messengers/zoom-us { }; + zotero = callPackage ../applications/office/zotero { firefox = firefox-esr-unwrapped; }; |