aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers
diff options
context:
space:
mode:
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix13
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix12
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix7
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix5
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix3
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix54
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix26
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix11
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/psi/default.nix21
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix2
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch148
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix28
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix21
-rwxr-xr-xinfra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh41
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix12
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix10
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix15
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt-install.patch159
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix6
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix21
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix4
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix12
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix8
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix12
-rw-r--r--infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix6
47 files changed, 257 insertions, 511 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 37d8adceae1c..c3479d1ee698 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -1,6 +1,6 @@
{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig, gst_all_1
, cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg_3
-, gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx
+, gsm, speex, portaudio, spandsp, libuuid, libvpx
}:
stdenv.mkDerivation rec {
version = "0.6.5";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [zlib openssl libre librem cairo mpg123
alsaLib SDL libv4l celt libsndfile srtp ffmpeg_3 gsm speex portaudio spandsp libuuid
- ccache libvpx
+ libvpx
] ++ (with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-bad gst-plugins-good ]);
makeFlags = [
"LIBRE_MK=${libre}/share/re/re.mk"
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
index 07e7b74a43c2..1a8110acacb9 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix
@@ -3,13 +3,13 @@
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "bitlbee-facebook";
- version = "1.2.0";
+ version = "1.2.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "bitlbee";
repo = "bitlbee-facebook";
- sha256 = "11068zhb1v55b1x0nhjc4f3p0glccxpcyk5c1630hfdzkj7vyqhn";
+ sha256 = "1yjhjhk3jzjip13lq009vlg84lm2lzwhac5jy0aq3vkcz6rp94rc";
};
nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
index f8bcdc4bef7c..8b6348340587 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
@@ -39,11 +39,12 @@
stdenv.mkDerivation rec {
pname = "bluejeans";
- version = "2.4.0";
+ version = "2.17.0";
+ buildNumber = "11";
src = fetchurl {
- url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans.rpm";
- sha256 = "180hc854ngwfn6y6nsrfn74rv78cxhq6sgshrca5zqv6wq3l98g0";
+ url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans_${version}.${buildNumber}.rpm";
+ sha256 = "1h5jbnp5bwy6bpma9a1ia08v7bpz09fm66jsip470k1r7vjjwa68";
};
nativeBuildInputs = [ rpmextract makeWrapper ];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix
index a262b0487464..d3633e2245ff 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/cordless/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "cordless";
- version = "2020-08-30";
+ version = "2020-11-22";
src = fetchFromGitHub {
owner = "Bios-Marcel";
repo = pname;
rev = version;
- sha256 = "sha256-CwOI7Ah4+sxD9We+Va5a6jYat5mjOeBk2EsOfwskz6k=";
+ sha256 = "0avf09b73fs3wpb4fzmm6ka595aanfvp95m6xj1ccxvq8ciwpqcw";
};
subPackages = [ "." ];
- vendorSha256 = "sha256-01I7GrZkaskuz20kVK2YwqvP7ViPMlQ3BFaoLHwgvOE=";
+ vendorSha256 = "01anbhwgwam70dymcmvkia1xpw48658rq7wv4m7fiavxvnli6z2y";
meta = with stdenv.lib; {
homepage = "https://github.com/Bios-Marcel/cordless";
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
index 795f71a3cd01..03508c2ffb53 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -18,24 +18,15 @@
stdenv.mkDerivation rec {
pname = "dino";
- version = "0.1.0";
+ version = "0.2.0";
src = fetchFromGitHub {
owner = "dino";
repo = "dino";
rev = "v${version}";
- sha256 = "1k5cgj5n8s40i71wqdh6m1q0njl45ichfdbbywx9rga5hljz1c54";
+ sha256 = "0wy1hb3kz3k4gqqwx308n37cqag2d017jwfz0b5s30nkx2pbwspw";
};
- patches = [
- (fetchpatch {
- # Allow newer versions of libsignal-protocol-c
- url = "https://github.com/dino/dino/commit/fbd70ceaac5ebbddfa21a580c61165bf5b861303.patch";
- sha256 = "0ydpwsmwrzfsry89fsffkfalhki4n1dw99ixjvpiingdrhjmwyl2";
- excludes = [ "plugins/signal-protocol/libsignal-protocol-c" ];
- })
- ];
-
nativeBuildInputs = [
vala
cmake
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix
index 8672f64be386..570fe463c5ae 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -7,30 +7,30 @@ in {
pname = "discord";
binaryName = "Discord";
desktopName = "Discord";
- version = "0.0.12";
+ version = "0.0.13";
src = fetchurl {
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
- sha256 = "0qrzvc8cp8azb1b2wb5i4jh9smjfw5rxiw08bfqm8p3v74ycvwk8";
+ sha256 = "0d5z6cbj9dg3hjw84pyg75f8dwdvi2mqxb9ic8dfqzk064ssiv7y";
};
};
ptb = callPackage ./base.nix rec {
pname = "discord-ptb";
binaryName = "DiscordPTB";
desktopName = "Discord PTB";
- version = "0.0.22";
+ version = "0.0.23";
src = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
- sha256 = "06qyh8i9d7il6q7q7iaymbbcmdcgrj6rc4z4xik1ay3fr7qy299j";
+ sha256 = "0vxz68vldrbmmw1alpwl7blfcy6byd6zg9m0851dm0p0ldyhsp5j";
};
};
canary = callPackage ./base.nix rec {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
- version = "0.0.114";
+ version = "0.0.116";
src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
- sha256 = "0j3w4jf4jisrpz03462sqjsrvjw50kqqq3psyympw0jb1wjccc41";
+ sha256 = "14kg85gz91f9mvvnl5p1lwz40rm47bca3a8dwv4618zv6vncgmkp";
};
};
}.${branch}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
index 287c864d3927..f2d882ad75e4 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
- "version": "1.7.9",
+ "version": "1.7.14",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@@ -62,7 +62,7 @@
},
"build": {
"appId": "im.riot.app",
- "electronVersion": "10.1.1",
+ "electronVersion": "10.1.3",
"files": [
"package.json",
{
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
index 2a611aa630a2..21374014c886 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
@@ -4394,11 +4394,11 @@
};
}
{
- name = "npm_user_validate___npm_user_validate_1.0.0.tgz";
+ name = "npm_user_validate___npm_user_validate_1.0.1.tgz";
path = fetchurl {
- name = "npm_user_validate___npm_user_validate_1.0.0.tgz";
- url = "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.0.tgz";
- sha1 = "8ceca0f5cea04d4e93519ef72d0557a75122e951";
+ name = "npm_user_validate___npm_user_validate_1.0.1.tgz";
+ url = "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-1.0.1.tgz";
+ sha1 = "31428fc5475fe8416023f178c0ab47935ad8c561";
};
}
{
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
index 5b537b2b7bf2..9a3dab920f40 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix
@@ -8,12 +8,12 @@
let
executableName = "element-desktop";
- version = "1.7.9";
+ version = "1.7.14";
src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-desktop";
rev = "v${version}";
- sha256 = "0hk9y6zzabfdi35fqzl9987d98a6k74fi0mzmhhvhvvpj8i1ldrn";
+ sha256 = "04zqvj7n803dwp4jkhiihhynp82birb14vamm6ys39a0zgs91cnv";
};
electron = electron_9;
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix
index 25e62423eae6..46ac18af9ee5 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web.nix
@@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec {
pname = "element-web";
- version = "1.7.9";
+ version = "1.7.14";
src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
- sha256 = "00ch486npqgrwmgfd7bsi6wb9ac6dpv08n13lygn45gha37l1kx1";
+ sha256 = "1wyk1si0dmlcskf25zmbijpz6505yzjxa7pvd3g2k9kxc49vi20j";
};
installPhase = ''
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix
index e0f56e2783d0..190050d8327b 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix
@@ -9,7 +9,7 @@ mkFranzDerivation rec {
sha256 = "0i24vcnq4iz5amqmn2fgk92ff9x9y7fg8jhc3g6ksvmcfly7af3k";
};
meta = with stdenv.lib; {
- description = "Ferdi allows you to combine your favorite messaging services into one application";
+ description = "Combine your favorite messaging services into one application";
homepage = "https://getferdi.com/";
license = licenses.free;
maintainers = [ maintainers.davidtwco ];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix
index 68e7282870ba..bc6dbc5ce193 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/fractal/default.nix
@@ -12,7 +12,7 @@
, pkg-config
, gtksourceview4
, glib
-, libhandy
+, libhandy_0
, gtk3
, dbus
, openssl
@@ -63,10 +63,10 @@ rustPlatform.buildRustPackage rec {
gtkSupport = true;
})
gst_all_1.gstreamer
- gst_all_1.gst-validate
+ gst_all_1.gst-devtools
gtk3
gtksourceview4
- libhandy
+ libhandy_0
openssl
sqlite
];
@@ -92,6 +92,7 @@ rustPlatform.buildRustPackage rec {
description = "Matrix group messaging app";
homepage = "https://gitlab.gnome.org/GNOME/fractal";
license = licenses.gpl3;
+ broken = stdenv.isDarwin;
maintainers = with maintainers; [ dtzWill worldofpeace ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix
index 52bc60b5affd..646a790fed25 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -3,10 +3,10 @@
mkFranzDerivation rec {
pname = "franz";
name = "Franz";
- version = "5.5.0";
+ version = "5.6.1";
src = fetchurl {
url = "https://github.com/meetfranz/franz/releases/download/v${version}/franz_${version}_amd64.deb";
- sha256 = "0kgfjai0pz0gpbxsmn3hbha7zr2kax0s1j3ygcsy4kzghla990wm";
+ sha256 = "1gn0n1hr6z2gsdnpxysyq6sm8y7cjr9jafhsam8ffw0bq74kph7p";
};
meta = with stdenv.lib; {
description = "A free messaging app that combines chat & messaging services into one application";
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix
index 3f05e3d7a5d3..96865374bed1 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/franz/generic.nix
@@ -28,7 +28,7 @@
# Helper function for building a derivation for Franz and forks.
{ pname, name, version, src, meta }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
inherit pname version src meta;
# Don't remove runtime deps.
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
expat
stdenv.cc.cc
];
- runtimeDependencies = [ (lib.getLib udev) libnotify ];
+ runtimeDependencies = [ stdenv.cc.cc.lib (lib.getLib udev) libnotify ];
unpackPhase = "dpkg-deb -x $src .";
@@ -84,6 +84,7 @@ stdenv.mkDerivation {
postFixup = ''
wrapProgram $out/opt/${name}/${pname} \
+ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath runtimeDependencies}" \
--prefix PATH : ${xdg_utils}/bin \
"''${gappsWrapperArgs[@]}"
'';
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 2ee017dfdbaf..eef24f75f155 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -60,6 +60,9 @@ python3.pkgs.buildPythonApplication rec {
${python3.interpreter} setup.py test
'';
+ # necessary for wrapGAppsHook
+ strictDeps = false;
+
meta = {
homepage = "http://gajim.org/";
description = "Jabber client written in PyGTK";
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix
index 57b745057dce..69a198480668 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/gitter/default.nix
@@ -1,29 +1,61 @@
-{ stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl
-, fontconfig, freetype, gdk-pixbuf, glib, gnome2, gtk3, libX11
+{ stdenv, alsaLib, atk, at-spi2-core, cairo, cups, dbus, dpkg, expat, fetchurl
+, fontconfig, freetype, gdk-pixbuf, glib, gnome2, gtk3, libdrm, libX11
, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes
, libXi, libXrandr, libXrender, libXtst, libappindicator-gtk3, libcxx
-, libnotify, libpulseaudio, libxcb, makeDesktopItem, makeWrapper, nspr, nss
+, libnotify, libpulseaudio, libxcb, makeDesktopItem, makeWrapper, mesa, nspr, nss
, pango, systemd }:
let gitterDirectorySuffix = "opt/gitter";
+ libPath = stdenv.lib.makeLibraryPath [
+ alsaLib
+ atk
+ at-spi2-core
+ cairo
+ cups
+ dbus
+ expat
+ fontconfig
+ freetype
+ gdk-pixbuf
+ glib
+ gnome2.GConf
+ gtk3
+ libX11
+ libXScrnSaver
+ libXcomposite
+ libXcursor
+ libXdamage
+ libXext
+ libXfixes
+ libXi
+ libXrandr
+ libXrender
+ libXtst
+ libappindicator-gtk3
+ libcxx
+ libdrm
+ libnotify
+ libpulseaudio
+ libxcb
+ mesa
+ nspr
+ nss
+ pango
+ stdenv.cc.cc
+ systemd
+ ];
doELFPatch = target: ''
patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
--set-rpath "$out/${gitterDirectorySuffix}/lib:${libPath}" \
$out/${gitterDirectorySuffix}/${target}
'';
- libPath = stdenv.lib.makeLibraryPath [
- alsaLib atk cairo cups dbus expat fontconfig freetype gdk-pixbuf glib
- gnome2.GConf gtk3 libX11 libXScrnSaver libXcomposite libXcursor libXdamage
- libXext libXfixes libXi libXrandr libXrender libXtst libappindicator-gtk3
- libcxx libnotify libpulseaudio libxcb nspr nss pango stdenv.cc.cc systemd
- ];
in stdenv.mkDerivation rec {
pname = "gitter";
- version = "4.1.0";
+ version = "5.0.1";
src = fetchurl {
url = "https://update.gitter.im/linux64/${pname}_${version}_amd64.deb";
- sha256 = "1gny9i2pywvczzrs93k8krqn6hwm6c2zg8yr3xmjqs3p88817wbi";
+ sha256 = "1ps9akylqrril4902r8mi0mprm0hb5wra51ry6c1rb5xz5nrzgh1";
};
nativeBuildInputs = [ makeWrapper dpkg ];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix
index c98fd9e80406..00134e2597be 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/gomuks/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "gomuks";
- version = "0.2.0";
+ version = "0.2.1";
src = fetchFromGitHub {
owner = "tulir";
repo = pname;
rev = "v" + version;
- sha256 = "0sf1nqwimxqql8wm6763jyc5rclhd4zxgg9gfi0qvg5ccm1r1z5q";
+ sha256 = "0xa4ch4p48w6sd0f4s1sp0hl1w4fvzhff7w2ar19ki0ydy5g368n";
};
- vendorSha256 = "sha256:0n9mwbzjkvlljlns7sby8nb9gm4vj0v4idp1zxv5xssqr5qalihf";
+ vendorSha256 = "1rhvwk8bdbbffhx2d03a8p9jc5c8v3pi7kw1dmyyngz6p7wq1g0x";
doCheck = false;
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix
index 97f775220229..caf6669e120b 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix
@@ -1,14 +1,14 @@
{ lib, python3Packages, fetchFromGitHub }:
python3Packages.buildPythonApplication rec {
- pname = "matrix-dl-unstable";
- version = "2019-09-22";
+ pname = "matrix-dl";
+ version = "unstable-2020-07-14";
src = fetchFromGitHub {
owner = "rubo77";
- repo = "matrix-dl";
- rev = "e91610f45b7b3b0aca34923309fc83ba377f8a69";
- sha256 = "036xfdd21pcfjlilknc67z5jqpk0vz07853wwcsiac32iypc6f2q";
+ repo = pname;
+ rev = "b1a86d1421f39ee327284e1023f09dc165e3c8a5";
+ sha256 = "1l8nh8z7kz24v0wcy3ll3w6in2yxwa1yz8lyc3x0blz37d8ss4ql";
};
propagatedBuildInputs = with python3Packages; [
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix
index e03bdd9909e8..92ddfe342982 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/composition.nix
@@ -6,7 +6,7 @@
let
nodeEnv = import ./node-env.nix {
- inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
+ inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix
index 670556bf271a..ff5ca0d99b19 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/matrix-recorder/node-env.nix
@@ -1,6 +1,6 @@
# This file originates from node2nix
-{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
+{stdenv, nodejs, python2, util-linux, libtool, runCommand, writeTextFile}:
let
python = if nodejs ? python then nodejs.python else python2;
@@ -396,7 +396,7 @@ let
stdenv.mkDerivation ({
name = "node_${name}-${version}";
buildInputs = [ tarWrapper python nodejs ]
- ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+ ++ stdenv.lib.optional (stdenv.isLinux) util-linux
++ stdenv.lib.optional (stdenv.isDarwin) libtool
++ buildInputs;
@@ -468,7 +468,7 @@ let
name = "node-dependencies-${name}-${version}";
buildInputs = [ tarWrapper python nodejs ]
- ++ stdenv.lib.optional (stdenv.isLinux) utillinux
+ ++ stdenv.lib.optional (stdenv.isLinux) util-linux
++ stdenv.lib.optional (stdenv.isDarwin) libtool
++ buildInputs;
@@ -514,7 +514,7 @@ let
stdenv.mkDerivation {
name = "node-shell-${name}-${version}";
- buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
+ buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) util-linux ++ buildInputs;
buildCommand = ''
mkdir -p $out/bin
cat > $out/bin/shell <<EOF
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix
index 98b326820b9f..23db7d1ce257 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix
@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
pname = "mcabber";
- version = "1.1.0";
+ version = "1.1.2";
src = fetchurl {
url = "https://mcabber.com/files/mcabber-${version}.tar.bz2";
- sha256 = "1ggh865p1rf10ffsnf4g6qv9i8bls36dxdb1nzs5r9vdqci2rz04";
+ sha256 = "0q1i5acyghsmzas88qswvki8kkk2nfpr8zapgnxbcd3lwcxl38f4";
};
nativeBuildInputs = [ pkgconfig ];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix
index 3bdfcbfe7d1d..a9306a751ac8 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, buildGoPackage, fetchFromGitLab }:
+{ stdenv, buildGoModule, fetchgit }:
-buildGoPackage {
+buildGoModule {
pname = "mm";
- version = "2016.11.04";
+ version = "2020.11.17";
- goPackagePath = "gitlab.com/meutraa/mm";
-
- src = fetchFromGitLab {
- owner = "meutraa";
- repo = "mm";
- rev = "473fdd97285168054b672dbad2ffc4047324c518";
- sha256 = "1s8v5gxpw1sms1g3i8nq2x2mmmyz97qkmxs1fzlspfcd6i8vknkp";
+ src = fetchgit {
+ url = "https://git.lost.host/meutraa/mm.git";
+ rev = "e5fa8eeb845aac8f28fc36013ee8a1dbe1e5710c";
+ sha256 = "sha256-SdD4EE/rc85H7xqKB/kU8XFsC63i1sVObPha/zrxFGk=";
};
- meta = {
+ vendorSha256 = "sha256-zJJ9PzQShv2iRNyCg1XVscbwjV9ZtMIojJDtXXm3rVM=";
+
+ meta = with stdenv.lib; {
description = "A file system based matrix client";
- homepage = "https://gitlab.com/meutraa/mm";
- license = stdenv.lib.licenses.isc;
+ homepage = "https://git.lost.host/meutraa/mm";
+ license = licenses.isc;
+ maintainers = with maintainers; [ meutraa ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
index 3b1fb255b6ee..9c99741823aa 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
@@ -10,7 +10,7 @@
buildPythonApplication rec {
pname = "pantalaimon";
- version = "0.7.0";
+ version = "0.8.0";
disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonApplication rec {
owner = "matrix-org";
repo = pname;
rev = version;
- sha256 = "0cx8sqajf5lh8w61yy1l6ry67rv1b45xp264zkw3s7ip80i4ylb2";
+ sha256 = "0n86cdpw85qzlcr1ynvar0f0zbphmdz1jia9r75lmj07iw4r5hk9";
};
propagatedBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
index cf7c1008a080..1112a3215c9d 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook
+{ mkDerivation, lib, fetchFromGitHub, cmake
, qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine
, libidn, qca-qt5, libsecret, libXScrnSaver, hunspell
, libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c
}:
-stdenv.mkDerivation rec {
+mkDerivation rec {
pname = "psi-plus";
version = "1.4.1473";
@@ -19,15 +19,16 @@ stdenv.mkDerivation rec {
"-DENABLE_PLUGINS=ON"
];
- nativeBuildInputs = [ cmake wrapQtAppsHook ];
+ nativeBuildInputs = [ cmake qttools ];
buildInputs = [
- qtbase qtmultimedia qtx11extras qttools qtwebengine
+ qtbase qtmultimedia qtx11extras qtwebengine
libidn qca-qt5 libsecret libXScrnSaver hunspell
libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c
];
- meta = with stdenv.lib; {
+ meta = with lib; {
+ homepage = "https://sourceforge.net/projects/psiplus/";
description = "XMPP (Jabber) client";
maintainers = with maintainers; [ orivej misuzu ];
license = licenses.gpl2;
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/psi/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/psi/default.nix
index c1984a218c8a..08c3ab96210f 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/psi/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/psi/default.nix
@@ -1,30 +1,33 @@
-{ stdenv, fetchFromGitHub, cmake, wrapQtAppsHook
+{ lib, mkDerivation, fetchFromGitHub, cmake
, qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine
, libidn, qca-qt5, libXScrnSaver, hunspell
}:
-stdenv.mkDerivation rec {
+
+mkDerivation rec {
pname = "psi";
- version = "1.4";
+ version = "1.5";
src = fetchFromGitHub {
owner = "psi-im";
repo = pname;
rev = version;
- sha256 = "09c7cg96vgxzgbpypgcw7yv73gvzppbi1lm4svbpfn2cfxy059d4";
+ sha256 = "hXDZODHl14kimRlMQ1XjISQ2kk9NS78axVN3U21wkuM=";
fetchSubmodules = true;
};
patches = [
./fix-cmake-hunspell-1.7.patch
];
- nativeBuildInputs = [ cmake wrapQtAppsHook ];
+ nativeBuildInputs = [ cmake qttools ];
buildInputs = [
- qtbase qtmultimedia qtx11extras qttools qtwebengine
+ qtbase qtmultimedia qtx11extras qtwebengine
libidn qca-qt5 libXScrnSaver hunspell
];
enableParallelBuilding = true;
- meta = with stdenv.lib; {
- description = "Psi, an XMPP (Jabber) client";
+
+ meta = with lib; {
+ homepage = "https://psi-im.org";
+ description = "An XMPP (Jabber) client";
maintainers = [ maintainers.raskin ];
license = licenses.gpl2;
- platforms = stdenv.lib.platforms.linux;
+ platforms = platforms.linux;
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 0df7a5d8e560..952182def26d 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -7,7 +7,7 @@
, AVFoundation ? null }:
let
- version = "1.17.2";
+ version = "1.17.3";
rev = "v${version}";
in mkDerivation {
@@ -17,7 +17,7 @@ in mkDerivation {
src = fetchFromGitHub {
owner = "qTox";
repo = "qTox";
- sha256 = "04pbv1zsxy8dph2v0r9xc8lcm5g6604pwnppi3la5w46ihbwxlb9";
+ sha256 = "19xgw9bqirxbgvj5cdh20qxh61pkwk838lq1l78n6py1qrs7z5wp";
inherit rev;
};
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index b1577a37844d..c031615a90bf 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -10,7 +10,7 @@ mkDerivation rec {
src = fetchFromGitHub {
owner = "QMatrixClient";
repo = "Quaternion";
- rev = "${version}";
+ rev = version;
sha256 = "0hqhg7l6wpkdbzrdjvrbqymmahziri07ba0hvbii7dd2p0h248fv";
};
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
index c1b9cdc122c4..93ab78c439a6 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
pname = "signal-cli";
- version = "0.6.10";
+ version = "0.6.12";
# Building from source would be preferred, but is much more involved.
src = fetchurl {
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
- sha256 = "0zglcx5ylqjc3hjkzi84mjhp9dchnnkv12qq75q5pqkx1w45rmim";
+ sha256 = "0i1y2p5qi2bwhkm8sv0wkb0lfi2vm26qalnpg6kn0ikcxkqkq5bc";
};
buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 69b3357b7d40..84f090228627 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -25,7 +25,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
- version = "1.37.1"; # Please backport all updates to the stable channel.
+ version = "1.38.2"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
- sha256 = "0zj068wkgb0k7iq4ld0lb06vk2zlsvv5pf0csr4zkzkq0hgzx33s";
+ sha256 = "1lq830760y4kmhqd29hhgnab6lryiipb01y0c5bbl886zk3z35n4";
};
nativeBuildInputs = [
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch
deleted file mode 100644
index 8b8ce8fd7bbf..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/skype-call-recorder/conference.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From abd67f1d44eef81baf2e9729f95e002c4ecc7350 Mon Sep 17 00:00:00 2001
-From: jlh <jlh@gmx.ch>
-Date: Fri, 16 Oct 2009 17:40:54 +0200
-Subject: [PATCH] Rudimentary support for recording hosted conference calls
-
----
- call.cpp | 37 +++++++++++++++++++++++++++++++++++--
- call.h | 11 ++++++++++-
- 2 files changed, 45 insertions(+), 3 deletions(-)
-
-diff --git a/call.cpp b/call.cpp
-index c2b02f2..663c1c1 100644
---- a/call.cpp
-+++ b/call.cpp
-@@ -90,9 +90,10 @@ void AutoSync::reset() {
-
- // Call class
-
--Call::Call(QObject *p, Skype *sk, CallID i) :
-- QObject(p),
-+Call::Call(CallHandler *h, Skype *sk, CallID i) :
-+ QObject(h),
- skype(sk),
-+ handler(h),
- id(i),
- status("UNKNOWN"),
- writer(NULL),
-@@ -119,6 +120,13 @@ Call::Call(QObject *p, Skype *sk, CallID i) :
- debug(QString("Call %1: cannot get partner display name").arg(id));
- displayName = "Unnamed Caller";
- }
-+
-+ // Skype does not properly send updates when the CONF_ID property
-+ // changes. since we need this information, check it now on all calls
-+ handler->updateConfIDs();
-+ // this call isn't yet in the list of calls, thus we need to
-+ // explicitely check its CONF_ID
-+ updateConfID();
- }
-
- Call::~Call() {
-@@ -134,6 +142,10 @@ Call::~Call() {
- // QT takes care of deleting servers and sockets
- }
-
-+void Call::updateConfID() {
-+ confID = skype->getObject(QString("CALL %1 CONF_ID").arg(id)).toLong();
-+}
-+
- bool Call::okToDelete() const {
- // this is used for checking whether past calls may now be deleted.
- // when a past call hasn't been decided yet whether it should have been
-@@ -270,6 +282,11 @@ void Call::startRecording(bool force) {
- if (isRecording)
- return;
-
-+ if (handler->isConferenceRecording(confID)) {
-+ debug(QString("Call %1: call is part of a conference that is already being recorded").arg(id));
-+ return;
-+ }
-+
- if (force) {
- emit showLegalInformation();
- } else {
-@@ -589,6 +606,22 @@ CallHandler::~CallHandler() {
- delete legalInformationDialog;
- }
-
-+void CallHandler::updateConfIDs() {
-+ QList<Call *> list = calls.values();
-+ for (int i = 0; i < list.size(); i++)
-+ list.at(i)->updateConfID();
-+}
-+
-+bool CallHandler::isConferenceRecording(CallID id) const {
-+ QList<Call *> list = calls.values();
-+ for (int i = 0; i < list.size(); i++) {
-+ Call *c = list.at(i);
-+ if (c->getConfID() == id && c->getIsRecording())
-+ return true;
-+ }
-+ return false;
-+}
-+
- void CallHandler::callCmd(const QStringList &args) {
- CallID id = args.at(0).toInt();
-
-diff --git a/call.h b/call.h
-index cb8396d..b746f46 100644
---- a/call.h
-+++ b/call.h
-@@ -43,6 +43,8 @@ class QTcpServer;
- class QTcpSocket;
- class LegalInformationDialog;
-
-+class CallHandler;
-+
- typedef int CallID;
-
- class AutoSync {
-@@ -68,18 +70,21 @@ private:
- class Call : public QObject {
- Q_OBJECT
- public:
-- Call(QObject *, Skype *, CallID);
-+ Call(CallHandler *, Skype *, CallID);
- ~Call();
- void startRecording(bool = false);
- void stopRecording(bool = true);
-+ void updateConfID();
- bool okToDelete() const;
- void setStatus(const QString &);
- QString getStatus() const { return status; }
- bool statusDone() const;
- bool statusActive() const;
- CallID getID() const { return id; }
-+ CallID getConfID() const { return confID; }
- void removeFile();
- void hideConfirmation(int);
-+ bool getIsRecording() const { return isRecording; }
-
- signals:
- void startedCall(int, const QString &);
-@@ -99,10 +104,12 @@ private:
-
- private:
- Skype *skype;
-+ CallHandler *handler;
- CallID id;
- QString status;
- QString skypeName;
- QString displayName;
-+ CallID confID;
- AudioFileWriter *writer;
- bool isRecording;
- int stereo;
-@@ -140,6 +147,8 @@ class CallHandler : public QObject {
- public:
- CallHandler(QObject *, Skype *);
- ~CallHandler();
-+ void updateConfIDs();
-+ bool isConferenceRecording(CallID) const;
- void callCmd(const QStringList &);
-
- signals:
---
-1.6.5.GIT
-
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
deleted file mode 100644
index 57d1ffece71a..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, cmake, lame, id3lib, libvorbis, qt4, libogg }:
-
-stdenv.mkDerivation {
- name = "skype-call-recorder-0.8";
- src = fetchurl {
- url = "https://atdot.ch/scr/files/0.8/skype-call-recorder-0.8.tar.gz";
- sha256 = "1iijkhq3aj9gr3bx6zl8ryvzkqcdhsm9yisimakwq0lnw0lgf5di";
- };
-
- # Keep an rpath reference to the used libogg
- prePatch = ''
- sed -i -e '/ADD_EXECUTABLE/aSET(LIBRARIES ''${LIBRARIES} ogg)' CMakeLists.txt
- '';
-
- # Better support for hosted conferences
- patches = [ ./conference.patch ];
-
- buildInputs = [ cmake lame id3lib libvorbis qt4 libogg ];
- NIX_LDFLAGS = "-lvorbis";
-
- meta = {
- homepage = "http://atdot.ch/scr/";
- description = "Open source tool to record your Skype calls on Linux";
- license = stdenv.lib.licenses.gpl2Plus;
- platforms = with stdenv.lib.platforms; linux;
- maintainers = with stdenv.lib.maintainers; [viric];
- };
-}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index bc5fa0e1f125..47a79c7309df 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -7,7 +7,7 @@ let
# Please keep the version x.y.0.z and do not update to x.y.76.z because the
# source of the latter disappears much faster.
- version = "8.64.0.81";
+ version = "8.66.0.74";
rpath = stdenv.lib.makeLibraryPath [
alsaLib
@@ -65,7 +65,7 @@ let
"https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
"https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"
];
- sha256 = "0p6sp45kabm97p3hp3wp087b3k42m26ji99kzhpsz3n9vzjiczjh";
+ sha256 = "11bpzr3j6fa5x62xrx2q2sr1wxjrn0a37053j4prxjcvdrc5in8f";
}
else
throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}";
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
index 2edccd8c019e..5f367c76a928 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -25,6 +25,7 @@
, libpulseaudio
, libuuid
, libxcb
+, libxkbcommon
, mesa
, nspr
, nss
@@ -39,9 +40,16 @@ let
throwSystem = throw "Unsupported system: ${system}";
pname = "slack";
+
+ x86_64-darwin-version = "4.11.1";
+ x86_64-darwin-sha256 = "0a5rq8zhgdckwxnyjv6nrgpnj682j1rd9yc4nwvsbvpzv15kmd35";
+
+ x86_64-linux-version = "4.11.1";
+ x86_64-linux-sha256 = "1r43g3xnla5aq38l3mpba8jb1gx9m2b6pr84prsclz27nr0rfm6g";
+
version = {
- x86_64-darwin = "4.9.0";
- x86_64-linux = "4.9.1";
+ x86_64-darwin = x86_64-darwin-version;
+ x86_64-linux = x86_64-linux-version;
}.${system} or throwSystem;
src = let
@@ -49,11 +57,11 @@ let
in {
x86_64-darwin = fetchurl {
url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg";
- sha256 = "007fflncvvclj4agb6g5hc5k9j5hhz1rpvlcfd8w31rn1vad4abk";
+ sha256 = x86_64-darwin-sha256;
};
x86_64-linux = fetchurl {
url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb";
- sha256 = "1n8br5vlcnf13b8m6727hy4bkmd6wayss96ck4ba9zsjiyj7v74i";
+ sha256 = x86_64-linux-sha256;
};
}.${system} or throwSystem;
@@ -68,6 +76,8 @@ let
linux = stdenv.mkDerivation rec {
inherit pname version src meta;
+ passthru.updateScript = ./update.sh;
+
rpath = stdenv.lib.makeLibraryPath [
alsaLib
at-spi2-atk
@@ -90,6 +100,7 @@ let
libpulseaudio
libuuid
libxcb
+ libxkbcommon
mesa
nspr
nss
@@ -152,6 +163,8 @@ let
darwin = stdenv.mkDerivation {
inherit pname version src meta;
+ passthru.updateScript = ./update.sh;
+
nativeBuildInputs = [ undmg ];
sourceRoot = "Slack.app";
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh
new file mode 100755
index 000000000000..adef44411091
--- /dev/null
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p curl gnused
+
+set -eou pipefail
+
+latest_linux_version=$(curl --silent https://slack.com/downloads/linux | sed -n 's/.*Version \([0-9\.]\+\).*/\1/p')
+latest_mac_version=$(curl --silent https://slack.com/downloads/mac | sed -n 's/.*Version \([0-9\.]\+\).*/\1/p')
+
+# Double check that the latest mac and linux versions are in sync.
+if [[ "$latest_linux_version" != "$latest_mac_version" ]]; then
+ echo "the latest linux ($latest_linux_version) and mac ($latest_mac_version) versions are not the same"
+ exit 1
+fi
+
+nixpkgs="$(git rev-parse --show-toplevel)"
+slack_nix="$nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix"
+nixpkgs_linux_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-linux-version = \"\([0-9\.]\+\)\";.*/\1/p')
+nixpkgs_mac_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p')
+
+if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && "$nixpkgs_mac_version" == "$latest_mac_version" ]]; then
+ echo "nixpkgs versions are all up to date!"
+ exit 0
+fi
+
+linux_url="https://downloads.slack-edge.com/linux_releases/slack-desktop-${latest_linux_version}-amd64.deb"
+mac_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/x64/Slack-${latest_mac_version}-macOS.dmg"
+linux_sha256=$(nix-prefetch-url ${linux_url})
+mac_sha256=$(nix-prefetch-url ${mac_url})
+
+sed -i "s/x86_64-linux-version = \".*\"/x86_64-linux-version = \"${latest_linux_version}\"/" "$slack_nix"
+sed -i "s/x86_64-darwin-version = \".*\"/x86_64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix"
+sed -i "s/x86_64-linux-sha256 = \".*\"/x86_64-linux-sha256 = \"${linux_sha256}\"/" "$slack_nix"
+sed -i "s/x86_64-darwin-sha256 = \".*\"/x86_64-darwin-sha256 = \"${mac_sha256}\"/" "$slack_nix"
+
+if ! nix-build -A slack "$nixpkgs"; then
+ echo "The updated slack failed to build."
+ exit 1
+fi
+
+echo "Successfully updated"
+echo "slack: $nixpkgs_linux_version -> $latest_linux_version"
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix
index 5806a269104b..e964c654c708 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/ssh-chat/default.nix
@@ -2,7 +2,7 @@
buildGoPackage rec {
pname = "ssh-chat";
- version = "1.9";
+ version = "1.10";
goPackagePath = "github.com/shazow/ssh-chat";
@@ -10,7 +10,7 @@ buildGoPackage rec {
owner = "shazow";
repo = "ssh-chat";
rev = "v${version}";
- sha256 = "04yszan6a7x9498s80xymf7wd10530yjrxcdw4czbplyhjdigxlg";
+ sha256 = "e4COAyheY+mE5zltR1Ms2OJ3I8iG/N1CZ6D7I9PDW5U=";
};
goDeps = ./deps.nix;
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix
index d58e27cc62bb..bf864eb41475 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix
@@ -15,11 +15,11 @@
stdenv.mkDerivation rec {
pname = "teams";
- version = "1.3.00.16851";
+ version = "1.3.00.25560";
src = fetchurl {
url = "https://packages.microsoft.com/repos/ms-teams/pool/main/t/teams/teams_${version}_amd64.deb";
- sha256 = "1mp4xq224nwv2ckb5zd7iv3yvkg3gv6mk9dvx3f60jgain7qr0r3";
+ sha256 = "0kpcd9q6v2qh0dzddykisdbi3djbxj2rl70wchlzrb6bx95hkzmc";
};
nativeBuildInputs = [ dpkg autoPatchelfHook wrapGAppsHook ];
@@ -47,9 +47,13 @@ stdenv.mkDerivation rec {
mv share $out/share
substituteInPlace $out/share/applications/teams.desktop \
- --replace /usr/bin/ $out/bin/
+ --replace /usr/bin/ ""
ln -s $out/opt/teams/teams $out/bin/
+
+ # Work-around screen sharing bug
+ # https://docs.microsoft.com/en-us/answers/questions/42095/sharing-screen-not-working-anymore-bug.html
+ rm $out/opt/teams/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay
'';
dontAutoPatchelf = true;
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 7d2586c67081..ba726d5b3771 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -33,13 +33,13 @@ in
stdenv.mkDerivation rec {
pname = "teamspeak-client";
- version = "3.5.3";
+ version = "3.5.6";
src = fetchurl {
url = "https://files.teamspeak-services.com/releases/client/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run";
sha256 = if stdenv.is64bit
- then "0fp9v2rkxf0zgvf3wcx8nsmf93bzdc22xlqxk3r8cb0415adp76a"
- else "0ni7hijprc8xygyz41568f1m9wwhl8lk5c3q28bm9m5r6qym39l6";
+ then "sha256:0hjai1bd4mq3g2dlyi0zkn8s4zlgxd38skw77mb78nc4di5gvgpg"
+ else "sha256:1y1c65nap91nv9xkvd96fagqbfl56p9n0rl6iac0i29bkysdmija";
};
# grab the plugin sdk for the desktop icon
@@ -99,15 +99,15 @@ stdenv.mkDerivation rec {
dontStrip = true;
dontPatchELF = true;
- meta = {
+ meta = with stdenv.lib; {
description = "The TeamSpeak voice communication tool";
homepage = "https://teamspeak.com/";
license = {
fullName = "Teamspeak client license";
- url = "http://sales.teamspeakusa.com/licensing.php";
+ url = "https://www.teamspeak.com/en/privacy-and-terms/";
free = false;
};
- maintainers = [ stdenv.lib.maintainers.lhvwb ];
+ maintainers = with maintainers; [ lhvwb lukegb ];
platforms = [ "i686-linux" "x86_64-linux" ];
};
}
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
index 761d7cfcbd4b..521e60c78f00 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, autoPatchelfHook, writeScript }:
+{ stdenv, fetchurl, postgresql, autoPatchelfHook, writeScript }:
let
arch = if stdenv.is64bit then "amd64" else "x86";
in stdenv.mkDerivation rec {
pname = "teamspeak-server";
- version = "3.12.1";
+ version = "3.13.2";
src = fetchurl {
url = "https://files.teamspeak-services.com/releases/server/${version}/teamspeak3-server_linux_${arch}-${version}.tar.bz2";
sha256 = if stdenv.is64bit
- then "1dxbnk12ry6arn1p38hpv5jfak55pmfmxkkl7aihn3sp1aizpgyg"
- else "0nfzx7pbzd95a7v08g29l84sc0lnv9fx8vz3mrmzhs0xqn9gxdkq";
+ then "1l9i9667wppwxbbnf6kxamnqlbxzkz9ync4rsypfla124b6cidpz"
+ else "0qhd05abiycsgc16r1p6y8bfdrl6zji21xaqwdizpr0jb01z335g";
};
- buildInputs = [ stdenv.cc.cc ];
+ buildInputs = [ stdenv.cc.cc postgresql.lib ];
nativeBuildInputs = [ autoPatchelfHook ];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index a1a1103b4fd4..6518f73a2299 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -1,10 +1,10 @@
{ mkDerivation, lib, fetchurl, callPackage
-, pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook
+, pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook, removeReferencesTo
, qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash
, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
, tl-expected, hunspell
# TODO: Shouldn't be required:
-, pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst
+, pcre, xorg, util-linux, libselinux, libsepol, epoxy, at-spi2-core, libXtst
, xdg_utils
}:
@@ -22,12 +22,12 @@ let
in mkDerivation rec {
pname = "telegram-desktop";
- version = "2.4.3";
+ version = "2.4.7";
# Telegram-Desktop with submodules
src = fetchurl {
url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz";
- sha256 = "15a8pnz4wf3464n8dvfzr9ck0vmhlx16ya1y889y3crjagm4ipjn";
+ sha256 = "1j2v29952l0am357pqvvgzm2zghmwhlr833kgp85hssxpr9xy4vv";
};
postPatch = ''
@@ -41,7 +41,7 @@ in mkDerivation rec {
dontWrapGApps = true;
dontWrapQtApps = true;
- nativeBuildInputs = [ pkgconfig cmake ninja python3 wrapGAppsHook wrapQtAppsHook ];
+ nativeBuildInputs = [ pkgconfig cmake ninja python3 wrapGAppsHook wrapQtAppsHook removeReferencesTo ];
buildInputs = [
qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash
@@ -49,7 +49,7 @@ in mkDerivation rec {
tl-expected hunspell
tg_owt
# TODO: Shouldn't be required:
- pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst
+ pcre xorg.libpthreadstubs xorg.libXdmcp util-linux libselinux libsepol epoxy at-spi2-core libXtst
];
enableParallelBuilding = true;
@@ -81,8 +81,7 @@ in mkDerivation rec {
postFixup = ''
# Nuke refs to `tg_owt` which is introduced by `__FILE__` in headers.
- sed -E "s|($NIX_STORE/)[a-z0-9]{32}(-${tg_owt.name})|\1eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee\2|g" \
- --in-place $out/bin/telegram-desktop
+ remove-references-to -t ${tg_owt} $out/bin/telegram-desktop
# This is necessary to run Telegram in a pure environment.
# We also use gappsWrapperArgs from wrapGAppsHook.
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt-install.patch b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt-install.patch
deleted file mode 100644
index bc8a23eb31e5..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt-install.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6fbc0da..6cbff3c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1856,3 +1856,41 @@ configure_file(
- "${CMAKE_CURRENT_BINARY_DIR}/tg_owtConfig.cmake"
- COPYONLY
- )
-+
-+install(
-+TARGETS
-+ tg_owt
-+ libabsl
-+ libopenh264
-+ libpffft
-+ librnnoise
-+ libsrtp
-+ libusrsctp
-+ libvpx
-+ ${vpx_export}
-+ libwebrtcbuild
-+ libyuv
-+ ${platform_export}
-+EXPORT tg_owtTargets
-+RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-+ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-+)
-+
-+install(
-+ DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/src/
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-+ FILES_MATCHING PATTERN "*.h"
-+)
-+
-+install(
-+ EXPORT tg_owtTargets
-+ NAMESPACE tg_owt::
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/tg_owt
-+)
-+
-+install(
-+ FILES ${CMAKE_CURRENT_BINARY_DIR}/tg_owtConfig.cmake
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/tg_owt
-+)
-diff --git a/cmake/libabsl.cmake b/cmake/libabsl.cmake
-index 2fb3b8c..4a4f85b 100644
---- a/cmake/libabsl.cmake
-+++ b/cmake/libabsl.cmake
-@@ -123,5 +123,6 @@ PRIVATE
-
- target_include_directories(libabsl
- PUBLIC
-- ${libabsl_loc}
-+ $<BUILD_INTERFACE:${libabsl_loc}>
-+ $<INSTALL_INTERFACE:include/third_party/abseil-cpp>
- )
-diff --git a/cmake/libpffft.cmake b/cmake/libpffft.cmake
-index a6ceb3e..435d3a3 100644
---- a/cmake/libpffft.cmake
-+++ b/cmake/libpffft.cmake
-@@ -24,5 +24,6 @@ endif()
-
- target_include_directories(libpffft
- PUBLIC
-- ${libpffft_loc}
-+ $<BUILD_INTERFACE:${libpffft_loc}>
-+ $<INSTALL_INTERFACE:include/third_party/pffft/src>
- )
-diff --git a/cmake/libsrtp.cmake b/cmake/libsrtp.cmake
-index 57c54b5..26b3466 100644
---- a/cmake/libsrtp.cmake
-+++ b/cmake/libsrtp.cmake
-@@ -30,6 +30,8 @@ PRIVATE
-
- target_include_directories(libsrtp
- PUBLIC
-- ${libsrtp_loc}/include
-- ${libsrtp_loc}/crypto/include
-+ $<BUILD_INTERFACE:${libsrtp_loc}/include>
-+ $<BUILD_INTERFACE:${libsrtp_loc}/crypto/include>
-+ $<INSTALL_INTERFACE:include/third_party/libsrtp/include>
-+ $<INSTALL_INTERFACE:include/third_party/libsrtp/crypto/include>
- )
-diff --git a/cmake/libusrsctp.cmake b/cmake/libusrsctp.cmake
-index caa0529..38d2ef6 100644
---- a/cmake/libusrsctp.cmake
-+++ b/cmake/libusrsctp.cmake
-@@ -67,6 +67,8 @@ endif()
-
- target_include_directories(libusrsctp
- PUBLIC
-- ${third_party_loc}/usrsctp/usrsctplib
-- ${libusrsctp_loc}
-+ $<BUILD_INTERFACE:${third_party_loc}/usrsctp/usrsctplib>
-+ $<BUILD_INTERFACE:${libusrsctp_loc}>
-+ $<INSTALL_INTERFACE:include/third_party/usrsctp/usrsctplib/usrsctplib>
-+ $<INSTALL_INTERFACE:include/third_party/usrsctp/usrsctplib>
- )
-diff --git a/cmake/libvpx.cmake b/cmake/libvpx.cmake
-index e192e7e..78cf25b 100644
---- a/cmake/libvpx.cmake
-+++ b/cmake/libvpx.cmake
-@@ -68,6 +68,11 @@ else()
- set(ASM_SUFFIX ".asm.S")
- endif()
-
-+foreach(dir ${include_directories})
-+ string(REPLACE ${libvpx_loc} include/third_party/libvpx install_include_dir ${dir})
-+ list(APPEND install_include_directories ${install_include_dir})
-+endforeach()
-+
- function(add_sublibrary postfix)
- add_library(libvpx_${postfix} OBJECT)
- init_feature_target(libvpx_${postfix} ${postfix})
-@@ -75,6 +80,8 @@ function(add_sublibrary postfix)
- target_include_directories(libvpx_${postfix}
- PRIVATE
- ${include_directories}
-+ "$<BUILD_INTERFACE:${include_directories}>"
-+ "$<INSTALL_INTERFACE:${install_include_directories}>"
- )
- set(sources_list ${ARGV})
- list(REMOVE_AT sources_list 0)
-@@ -725,5 +732,6 @@ endif()
-
- target_include_directories(libvpx
- PUBLIC
-- ${include_directories}
-+ "$<BUILD_INTERFACE:${include_directories}>"
-+ "$<INSTALL_INTERFACE:${install_include_directories}>"
- )
-diff --git a/cmake/libwebrtcbuild.cmake b/cmake/libwebrtcbuild.cmake
-index c3520b8..9b4b543 100644
---- a/cmake/libwebrtcbuild.cmake
-+++ b/cmake/libwebrtcbuild.cmake
-@@ -44,5 +44,6 @@ endif()
-
- target_include_directories(libwebrtcbuild
- INTERFACE
-- ${webrtc_loc}
-+ $<BUILD_INTERFACE:${webrtc_loc}>
-+ $<INSTALL_INTERFACE:include>
- )
-diff --git a/cmake/libyuv.cmake b/cmake/libyuv.cmake
-index ebfc6f0..18e70ef 100644
---- a/cmake/libyuv.cmake
-+++ b/cmake/libyuv.cmake
-@@ -126,7 +126,8 @@ endif()
-
- target_include_directories(libyuv
- PUBLIC
-- ${libyuv_loc}/include
-+ $<BUILD_INTERFACE:${libyuv_loc}/include>
-+ $<INSTALL_INTERFACE:include/third_party/libyuv/include>
- )
-
- target_compile_definitions(libyuv
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
index 47e9b6787e3e..48499bf9f2c7 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix
@@ -3,8 +3,8 @@
}:
let
- rev = "c73a4718cbff7048373a63db32068482e5fd11ef";
- sha256 = "0nr20mvvmmg8ii8f2rljd7iv2szplcfjn40rpy6llkmf705mwr1k";
+ rev = "e8fcae73947445db3d418fb7c20b964b59e14706";
+ sha256 = "0s2dd41r71aixhvympiqfks1liv7x78y60n0i87vmyxyfx449b5h";
in stdenv.mkDerivation {
pname = "tg_owt";
@@ -16,8 +16,6 @@ in stdenv.mkDerivation {
inherit rev sha256;
};
- patches = [ ./tg_owt-install.patch ];
-
nativeBuildInputs = [ pkg-config cmake ninja yasm ];
buildInputs = [ libjpeg openssl libopus ffmpeg alsaLib libpulseaudio ];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
index a6e74443f291..bc0657f7b1a7 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
@@ -1,7 +1,6 @@
{ stdenv
, fetchurl
-, fetchpatch
-, pkgconfig
+, pkg-config
, dconf
, telepathy-glib
, python3
@@ -11,31 +10,21 @@
stdenv.mkDerivation rec {
pname = "telepathy-mission-control";
- version = "5.16.5";
+ version = "5.16.6";
outputs = [ "out" "lib" "dev" ];
src = fetchurl {
url = "https://telepathy.freedesktop.org/releases/${pname}/${pname}-${version}.tar.gz";
- sha256 = "00xxv38cfdirnfvgyd56m60j0nkmsv5fz6p2ydyzsychicxl6ssc";
+ sha256 = "0ibs575pfr0wmhfcw6ln6iz7gw2y45l3bah11rksf6g9jlwsxy1d";
};
- patches = [
- # Fix property name (new GLib is stricter)
- # https://github.com/NixOS/nixpkgs/pull/81626#issuecomment-601494939
- # https://gitlab.gnome.org/GNOME/polari/-/merge_requests/141
- (fetchpatch {
- url = "https://github.com/TelepathyIM/telepathy-mission-control/commit/d8dab08fe8db137c6bbd8bbdc3d9b01d98c48910.patch";
- sha256 = "1rchl0lyfj5c3yhl63spzvx9b6ny3967dlq4hgp9qhqn0zjra3sb";
- })
- ];
-
buildInputs = [
python3
]; # ToDo: optional stuff missing
nativeBuildInputs = [
- pkgconfig
+ pkg-config
libxslt
makeWrapper
];
@@ -57,7 +46,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "An account manager and channel dispatcher for the Telepathy framework";
homepage = "https://telepathy.freedesktop.org/components/telepathy-mission-control/";
- license = licenses.lgpl21;
+ license = licenses.lgpl21Only;
maintainers = with maintainers; [ jtojnar ];
platforms = platforms.unix;
};
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix
index 540aa3fcea4d..a2489427b946 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/toxic/default.nix
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "toxic";
- version = "0.8.3";
+ version = "0.10.0";
src = fetchFromGitHub {
owner = "Tox";
repo = "toxic";
rev = "v${version}";
- sha256 = "09l2j3lwvrq7bf3051vjsnml9w63790ly3iylgf26gkrmld6k31w";
+ sha256 = "1v9cdpy6i3xl70g75zg33sqi4aqp20by0pyjhjg5iz24fxvfaw6c";
};
makeFlags = [ "PREFIX=$(out)"];
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix
index e53b8c7391e8..24ce75dc7974 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/viber/default.nix
@@ -1,15 +1,16 @@
{fetchurl, stdenv, dpkg, makeWrapper,
- alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, harfbuzz, libcap,
- libpulseaudio, libxml2, libxslt, libGLU, libGL, nspr, nss, openssl, systemd, wayland, xorg, zlib, ...
+ alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1,
+ harfbuzz, libcap, libGL, libGLU, libpulseaudio, libxkbcommon, libxml2, libxslt,
+ nspr, nss, openssl, systemd, wayland, xorg, zlib, ...
}:
stdenv.mkDerivation {
pname = "viber";
- version = "7.0.0.1035";
+ version = "13.3.1.22";
src = fetchurl {
url = "https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb";
- sha256 = "06mp2wvqx4y6rd5gs2mh442qcykjrrvwnkhlpx0lara331i2p0lj";
+ sha256 = "0rs26x0lycavybn6k1hbb5kzms0zzcmxlrmi4g8k7vyafj6s8dqh";
};
buildInputs = [ dpkg makeWrapper ];
@@ -29,10 +30,11 @@ stdenv.mkDerivation {
gst_all_1.gstreamer
harfbuzz
libcap
+ libGLU libGL
libpulseaudio
+ libxkbcommon
libxml2
libxslt
- libGLU libGL
nspr
nss
openssl
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index 44aa3a6ac66f..b198b954bd40 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -22,13 +22,13 @@ let
pname = "wire-desktop";
version = {
- x86_64-darwin = "3.20.3912";
- x86_64-linux = "3.20.2934";
+ x86_64-darwin = "3.21.3959";
+ x86_64-linux = "3.21.2936";
}.${system} or throwSystem;
sha256 = {
- x86_64-darwin = "1crkdqzq3iccxbrqlrar4ai43qzjsgd4hvcajgzmz2y33f30xgqr";
- x86_64-linux = "0z6vrhzrhrrnl3swjbxrbl1dhk2fx86s45n2z2in2shdlv08dcx7";
+ x86_64-darwin = "0fgzzqf1wnkjbcr0j0vjn6sggkz0z1kx6w4gi7gk4c4markdicm1";
+ x86_64-linux = "033804nkz1fdmq3p8iplrlx708x1fjlr09bmrpy36lqg5h7m3yd6";
}.${system} or throwSystem;
meta = with stdenv.lib; {
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 3109db89ff37..887e3f458bc4 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -6,8 +6,9 @@
, qtquickcontrols2, qtscript, qtsvg , qttools, qtwayland, qtwebchannel
, qtwebengine
# Runtime
-, coreutils, faac, pciutils, procps, utillinux
+, coreutils, faac, pciutils, procps, util-linux
, pulseaudioSupport ? true, libpulseaudio ? null
+, alsaSupport ? stdenv.isLinux, alsaLib ? null
}:
assert pulseaudioSupport -> libpulseaudio != null;
@@ -15,11 +16,11 @@ assert pulseaudioSupport -> libpulseaudio != null;
let
inherit (stdenv.lib) concatStringsSep makeBinPath optional;
- version = "5.3.469451.0927";
+ version = "5.4.53350.1027";
srcs = {
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
- sha256 = "0qb9jx2zd5p6jk1g0xmh1f6xlf4gfl38ns6ixpc653qfimy8b0av";
+ sha256 = "11va3px42y81bwy10mxm7mk0kf2sni9gwb422pq9djck2dgchw5x";
};
};
@@ -45,7 +46,8 @@ in mkDerivation {
qtscript qtwebchannel qtwebengine qtimageformats qtsvg qttools qtwayland
];
- runtimeDependencies = optional pulseaudioSupport libpulseaudio;
+ runtimeDependencies = optional pulseaudioSupport libpulseaudio
+ ++ optional alsaSupport alsaLib;
installPhase =
let
@@ -103,7 +105,7 @@ in mkDerivation {
dontWrapQtApps = true;
qtWrapperArgs = [
- ''--prefix PATH : ${makeBinPath [ coreutils glib.dev pciutils procps qttools.dev utillinux ]}''
+ ''--prefix PATH : ${makeBinPath [ coreutils glib.dev pciutils procps qttools.dev util-linux ]}''
# --run "cd ${placeholder "out"}/share/zoom-us"
# ^^ unfortunately, breaks run arg into multiple array elements, due to
# some bad array propagation. We'll do that in bash below
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix
index dbf6cf46e92b..a177499154ee 100644
--- a/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/instant-messengers/zulip/default.nix
@@ -5,12 +5,12 @@
let
pname = "zulip";
- version = "5.4.3";
+ version = "5.5.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage";
- sha256 = "0yd4g87kcwiy1arx3y2nyb7lq1nlh4cn87762k2sd8n4s9i52c7r";
+ sha256 = "059zfcvaq8wnsz2lfd4gdb17b6nngqk3vgisy2kb29ifqf3lpzqi";
name="${pname}-${version}.AppImage";
};
@@ -32,7 +32,7 @@ in appimageTools.wrapType2 {
meta = with lib; {
description = "Desktop client for Zulip Chat";
- homepage = "https://zulipchat.com";
+ homepage = "https://zulip.com";
license = licenses.asl20;
maintainers = with maintainers; [ jonafato ];
platforms = [ "x86_64-linux" ];