diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-06-21 07:42:14 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-06-21 07:42:14 +0200 |
| commit | 404f91c4c2a6802c5bae4a0823a89b0468cfc331 (patch) | |
| tree | 14a88573c8354d94cd31699511a9edda1158cd7d /pkgs/top-level | |
| parent | 1a1fdaa9d296af19c054883d00eaf9ec1fc28836 (diff) | |
| parent | b0b76bf75a7661221ee80e90af6c5bd7fe086101 (diff) | |
| download | nixlib-404f91c4c2a6802c5bae4a0823a89b0468cfc331.tar nixlib-404f91c4c2a6802c5bae4a0823a89b0468cfc331.tar.gz nixlib-404f91c4c2a6802c5bae4a0823a89b0468cfc331.tar.bz2 nixlib-404f91c4c2a6802c5bae4a0823a89b0468cfc331.tar.lz nixlib-404f91c4c2a6802c5bae4a0823a89b0468cfc331.tar.xz nixlib-404f91c4c2a6802c5bae4a0823a89b0468cfc331.tar.zst nixlib-404f91c4c2a6802c5bae4a0823a89b0468cfc331.zip | |
Merge master into staging
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f82853a751a3..c1c73cd8d999 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17423,6 +17423,8 @@ with pkgs; osmctools = callPackage ../applications/misc/osmctools { }; + owamp = callPackage ../applications/networking/owamp { }; + vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; vivaldi-ffmpeg-codecs = callPackage ../applications/networking/browsers/vivaldi/ffmpeg-codecs.nix {}; @@ -18230,7 +18232,7 @@ with pkgs; gconf = gnome2.GConf; }; - teamspeak_client = libsForQt59.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; + teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { }; uaskjuggler = callPackage ../applications/misc/taskjuggler { }; |