diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/instant-messengers')
5 files changed, 37 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix index a8d3d2607de4..9b16c05241c8 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/armcord/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { in { x86_64-linux = fetchurl { - url = "${base}/v${version}/ArmCord_${builtins.head (lib.splitString "-" version)}_amd64.deb"; + url = "${base}/v${version}/ArmCord_${version}_amd64.deb"; hash = "sha256-6zlYm4xuYpG+Bgsq5S+B/Zt9TRB2GZnueKAg2ywYLE4="; }; aarch64-linux = fetchurl { - url = "${base}/v${version}/ArmCord_${builtins.head (lib.splitString "-" version)}_arm64.deb"; + url = "${base}/v${version}/ArmCord_${version}_arm64.deb"; hash = "sha256-HJu1lRa3zOTohsPMe23puHxg1VMWNR2aOjDQJqc4TqE="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix index 336d045b6c16..ae8bc922bb46 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -1,23 +1,46 @@ -{ lib, buildNpmPackage, fetchFromGitHub, writeText, jq, conf ? { } }: +{ lib +, buildNpmPackage +, fetchFromGitHub +, writeText +, jq +, python3 +, pkg-config +, pixman +, cairo +, pango +, stdenv +, darwin +, conf ? { } +}: let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); in buildNpmPackage rec { pname = "cinny"; - version = "2.2.6"; + version = "3.0.0"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny"; rev = "v${version}"; - hash = "sha256-Da/gbq9piKvkIMiamoafcRrqxF7128GXoswk2C43An8="; + hash = "sha256-BFovEmT4RgdzlSYi1p0324PW7+2rvw3n5+jKWTV2FF4="; }; - npmDepsHash = "sha256-3wgB/dQmLtwxbRsk+OUcyfx98vpCvhvseEOCrJIFohY="; + npmDepsHash = "sha256-E+VBs66chBeiK40DZZ1hWTTISKaBN1RA+Uyr1iHqfus="; nativeBuildInputs = [ jq + python3 + pkg-config + ]; + + buildInputs = [ + pixman + cairo + pango + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreText ]; installPhase = '' @@ -32,7 +55,7 @@ buildNpmPackage rec { meta = with lib; { description = "Yet another Matrix client for the web"; homepage = "https://cinny.in/"; - maintainers = with maintainers; [ abbe ]; + maintainers = with maintainers; [ abbe ashkitten ]; license = licenses.agpl3Only; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix index 0c4bebcab96a..ce304a4fb23a 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openasar"; - version = "unstable-2023-07-07"; + version = "unstable-2023-10-24"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "5ac246dc92e9a2a9b314d899df728f37096c482b"; - hash = "sha256-ODeVru4LCSl3rIeJCdezAwqzKP6IRo5WDaaUymqEcBs="; + rev = "eee9bab822e3dbd97a735d0050ddd41ba27917f2"; + hash = "sha256-SSWQSqGgTZjowgrzF6qHZDTw/Y9xFHNTZvetxqZubYI="; }; postPatch = '' diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix index b410cfdea338..8c292d444206 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/webcord/default.nix @@ -62,7 +62,7 @@ buildNpmPackage rec { makeWrapper '${lib.getExe electron_27}' $out/bin/webcord \ --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/webcord \ --suffix PATH : "${binPath}" \ - --add-flags "--ozone-platform-hint=auto" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --add-flags $out/lib/node_modules/webcord/ runHook postInstall @@ -88,7 +88,7 @@ buildNpmPackage rec { changelog = "https://github.com/SpacingBat3/WebCord/releases/tag/v${version}"; license = lib.licenses.mit; mainProgram = "webcord"; - maintainers = with lib.maintainers; [ huantian ]; + maintainers = with lib.maintainers; [ eclairevoyant huantian ]; platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index bfc5ad79327b..cf6a9ccae535 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -50,7 +50,7 @@ let # find where to edit them. versions.aarch64-darwin = "5.16.2.23409"; versions.x86_64-darwin = "5.16.2.23409"; - versions.x86_64-linux = "5.16.2.8828"; + versions.x86_64-linux = "5.16.5.303"; srcs = { aarch64-darwin = fetchurl { @@ -64,7 +64,7 @@ let }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-eRvgNrMe/NyOnsMJ8L659C3Cl4xZ5Ij1u4qoHehj4y8="; + hash = "sha256-M+76HzqhPVxsP0nZOG4Oe8lnRJ9MJ2mE4+1hGvRkSUg="; }; }; |