From 50160b9da60c020a80360dd73fd30e67fb54be40 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 27 May 2024 10:38:06 -0400 Subject: [PATCH 01/25] telegram-desktop: add missing glib-networking dependency (cherry picked from commit 834946b941694c2284704c95b6aa7bac5674453c) --- .../instant-messengers/telegram/telegram-desktop/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 79101e7f85b64..6fdabc3159008 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -15,6 +15,7 @@ , qtsvg , qtimageformats , gtk3 +, glib-networking , boost , fmt , libdbusmenu @@ -137,6 +138,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ qtwayland gtk3 + glib-networking fmt libdbusmenu alsa-lib From 858c6352ff692e3671b41cc38dc1d245b92017ce Mon Sep 17 00:00:00 2001 From: oxalica Date: Sat, 15 Jun 2024 03:12:06 -0400 Subject: [PATCH 02/25] telegram-desktop.tg_owt: 0-unstable-2023-12-21 -> 0-unstable-2024-06-15 Diff: https://github.com/desktop-app/tg_owt/compare/afd9d5d31798d3eacf9ed6c30601e91d0f1e4d60...c9cc4390ab951f2cbc103ff783a11f398b27660b (cherry picked from commit 0dfa1472d894c8643abafc65f954bfb4cbe0cecc) --- .../instant-messengers/telegram/telegram-desktop/tg_owt.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index 8bc0f6f93b442..1889c1825d8c3 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "0-unstable-2023-12-21"; + version = "0-unstable-2024-06-15"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "afd9d5d31798d3eacf9ed6c30601e91d0f1e4d60"; - sha256 = "sha256-/1cghoxmm+6uFEUgCjh1Xhb0CTnd1XAq1M21FruDRek="; + rev = "c9cc4390ab951f2cbc103ff783a11f398b27660b"; + sha256 = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY="; fetchSubmodules = true; }; From 36768d95a5125910a75ecb41add40095195acc91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Jun 2024 08:37:14 +0000 Subject: [PATCH 03/25] telegram-desktop: 5.1.7 -> 5.1.8 (cherry picked from commit 04af4166e402c15d72e165ddd93f3e4484f97c50) --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 6fdabc3159008..27617f930fae5 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -64,14 +64,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "5.1.7"; + version = "5.1.8"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-OH9+cH5CQyrp4DSKXEMs6csGiH+GAtxJT4P9YidmAcM="; + hash = "sha256-YTCvniC8THoz0BUM/gkr97rhbbSVQ+SCE1H3qS68lIM="; }; patches = [ From 4f6ca9799238e627fc5926265fa642f7de7aa71b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 30 Jun 2024 20:40:42 -0400 Subject: [PATCH 04/25] telegram-desktop: 5.1.8 -> 5.2.0 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.1.8...v5.2.0 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.2.0 (cherry picked from commit cbfb356db9f4451a5208176f147047a352257aa2) --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 27617f930fae5..69dd0ea943348 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -64,14 +64,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "5.1.8"; + version = "5.2.0"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-YTCvniC8THoz0BUM/gkr97rhbbSVQ+SCE1H3qS68lIM="; + hash = "sha256-n7FWTdI9lzaaa/t/v+uJYaU0TxLQWXvdRQFJXjeOOhQ="; }; patches = [ From e7a1434d6b2133bccd3256c0df98943d075ee565 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 1 Jul 2024 17:16:09 -0400 Subject: [PATCH 05/25] telegram-desktop: 5.2.0 -> 5.2.1 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.2.0...v5.2.1 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.2.1 (cherry picked from commit 8ee2882be6d15983e5f9062c2e2b9c56eaeded28) --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 69dd0ea943348..30129445b7c98 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -64,14 +64,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "5.2.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-n7FWTdI9lzaaa/t/v+uJYaU0TxLQWXvdRQFJXjeOOhQ="; + hash = "sha256-mIdndn69ty82Mv2vLlHOPf4ZEu7/5vGVabk9ohLuKMA="; }; patches = [ From e1afe9bd79aba1014e4765a6f4b51c352fdeb514 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 2 Jul 2024 16:54:42 -0400 Subject: [PATCH 06/25] telegram-desktop: 5.2.1 -> 5.2.2 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.2.1...v5.2.2 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.2.2 (cherry picked from commit 54c2f432817b677e3bc5e9e7287cc202d7c44bc8) --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 30129445b7c98..01e3e96e384cd 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -64,14 +64,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "5.2.1"; + version = "5.2.2"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-mIdndn69ty82Mv2vLlHOPf4ZEu7/5vGVabk9ohLuKMA="; + hash = "sha256-rvd4Ei4MpWiilHCV291UrJkHaUcwth9AWc3PSqjj+EI="; }; patches = [ From 57afe6e338420fb3fa3c6b6f7d46f3910c0e68d2 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 2 Jul 2024 16:56:27 -0400 Subject: [PATCH 07/25] telegram-desktop: depends on LocalAuthentication on darwin platforms (cherry picked from commit 6127eef2f46c62ec68419e6388fa8c8da7d935d2) --- .../instant-messengers/telegram/telegram-desktop/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 01e3e96e384cd..f6941bef7edc2 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -179,6 +179,7 @@ stdenv.mkDerivation rec { IOSurface Metal NaturalLanguage + LocalAuthentication libicns ]); From 0dde43e087c97b586f09dbc9d67f350f94fcdd76 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 2 Jul 2024 20:31:48 -0400 Subject: [PATCH 08/25] telegram-desktop: update patch for disabling url scheme registration (cherry picked from commit 74375870f565e10d2495e8fbe6524246aed34b6a) --- .../telegram/telegram-desktop/default.nix | 6 +----- .../telegram/telegram-desktop/scheme.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index f6941bef7edc2..b81582a65fd54 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , callPackage , pkg-config , cmake @@ -79,10 +78,7 @@ stdenv.mkDerivation rec { # the generated .desktop files contains references to unwrapped tdesktop, breaking scheme handling # and the scheme handler is already registered in the packaged .desktop file, rendering this unnecessary # see https://github.com/NixOS/nixpkgs/issues/218370 - (fetchpatch { - url = "https://salsa.debian.org/debian/telegram-desktop/-/raw/09b363ed5a4fcd8ecc3282b9bfede5fbb83f97ef/debian/patches/Disable-register-custom-scheme.patch"; - hash = "sha256-B8X5lnSpwwdp1HlvyXJWQPybEN+plOwimdV5gW6aY2Y="; - }) + ./scheme.patch ]; postPatch = lib.optionalString stdenv.isLinux '' diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch new file mode 100644 index 0000000000000..58aaa8a7fcb54 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch @@ -0,0 +1,12 @@ +diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp +index e3e0de6c6..d5851bd6e 100644 +--- a/Telegram/SourceFiles/core/application.cpp ++++ b/Telegram/SourceFiles/core/application.cpp +@@ -421,7 +421,6 @@ void Application::run() { + + void Application::autoRegisterUrlScheme() { + if (!OptionSkipUrlSchemeRegister.value()) { +- InvokeQueued(this, [] { RegisterUrlScheme(); }); + } + } + From a09ed1340d282250c37a162ee9bcd5babec7d894 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 4 Jul 2024 14:19:00 -0400 Subject: [PATCH 09/25] telegram-desktop: use finalAttrs pattern to simplify packaging tdesktop forks (cherry picked from commit f037c473af8268e5ef7696ee02d3248f0aa8f2eb) --- .../telegram/telegram-desktop/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index b81582a65fd54..26a9813441b75 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -59,16 +59,15 @@ let cxxStandard = "20"; }; }; - mainProgram = if stdenv.isLinux then "telegram-desktop" else "Telegram"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; version = "5.2.2"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; hash = "sha256-rvd4Ei4MpWiilHCV291UrJkHaUcwth9AWc3PSqjj+EI="; }; @@ -200,19 +199,19 @@ stdenv.mkDerivation rec { installPhase = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications - cp -r ${mainProgram}.app $out/Applications - ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin} + cp -r ${finalAttrs.meta.mainProgram}.app $out/Applications + ln -s $out/{Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS,bin} ''; postFixup = lib.optionalString stdenv.isLinux '' # This is necessary to run Telegram in a pure environment. # We also use gappsWrapperArgs from wrapGAppsHook. - wrapProgram $out/bin/${mainProgram} \ + wrapProgram $out/bin/${finalAttrs.meta.mainProgram} \ "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} '' + lib.optionalString stdenv.isDarwin '' - wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram} + wrapQtApp $out/Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS/${finalAttrs.meta.mainProgram} ''; passthru = { @@ -231,6 +230,6 @@ stdenv.mkDerivation rec { homepage = "https://desktop.telegram.org/"; changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}"; maintainers = with maintainers; [ nickcao ]; - inherit mainProgram; + mainProgram = if stdenv.hostPlatform.isLinux then "telegram-desktop" else "Telegram"; }; -} +}) From a12bf813827b18caa949646efd09e070f8c35b0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 15:41:26 +0000 Subject: [PATCH 10/25] telegram-desktop: 5.2.2 -> 5.2.3 (cherry picked from commit ef593c9e1f3dd59be42b0955c24320806b03ab00) --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 26a9813441b75..0eb675ce69f2e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -62,14 +62,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.2.2"; + version = "5.2.3"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-rvd4Ei4MpWiilHCV291UrJkHaUcwth9AWc3PSqjj+EI="; + hash = "sha256-VSMSlR3rIUTYQ4GLQrVMZNrSAFfh3aJo6p92xgXMrvo="; }; patches = [ From 70dab1ab7a2af82231136c8eb1942242da88b7fb Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 31 Jul 2024 20:03:37 -0400 Subject: [PATCH 11/25] telegram-desktop.tg_owt: 0-unstable-2024-06-15 -> 0-unstable-2024-07-30 Diff: https://github.com/desktop-app/tg_owt/compare/c9cc4390ab951f2cbc103ff783a11f398b27660b...e9d103e2480e0983bf464debc371b049cdd83648 (cherry picked from commit 338371a8dc8da326eed8531015c9aa7660d5dd77) --- .../telegram/telegram-desktop/tg_owt.nix | 148 +++++++++++------- 1 file changed, 93 insertions(+), 55 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index 1889c1825d8c3..a552a6da7fdea 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -1,79 +1,117 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch -, pkg-config, cmake, ninja, yasm -, libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf -, openh264, usrsctp, libevent, libvpx -, libX11, libXtst, libXcomposite, libXdamage, libXext, libXrender, libXrandr, libXi -, glib, abseil-cpp, pcre, util-linuxMinimal, libselinux, libsepol, pipewire -, mesa, libepoxy, libglvnd, unstableGitUpdater, darwin +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + cmake, + crc32c, + python3, + libjpeg, + openssl, + libopus, + ffmpeg, + openh264, + libvpx, + libXi, + libXfixes, + libXtst, + libXcomposite, + libXdamage, + libXext, + libXrender, + libXrandr, + glib, + abseil-cpp, + pipewire, + mesa, + libGL, + unstableGitUpdater, + darwin, }: stdenv.mkDerivation { pname = "tg_owt"; - version = "0-unstable-2024-06-15"; + version = "0-unstable-2024-07-30"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "c9cc4390ab951f2cbc103ff783a11f398b27660b"; - sha256 = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY="; + rev = "e9d103e2480e0983bf464debc371b049cdd83648"; + sha256 = "sha256-EbxQ5JozZM7z9e9ELcqZpuX9rxbk7BrOBM7FRj8T1ec="; fetchSubmodules = true; }; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; - nativeBuildInputs = [ pkg-config cmake ninja yasm ]; + nativeBuildInputs = [ + cmake + pkg-config + python3 + ]; - buildInputs = [ - libjpeg libopus ffmpeg protobuf openh264 usrsctp libevent libvpx abseil-cpp - ] ++ lib.optionals stdenv.isLinux [ - libX11 libXtst libXcomposite libXdamage libXext libXrender libXrandr libXi - glib pcre util-linuxMinimal libselinux libsepol pipewire alsa-lib libpulseaudio - mesa libepoxy libglvnd - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - Cocoa - AppKit - IOKit - IOSurface - Foundation - AVFoundation - CoreMedia - VideoToolbox - CoreGraphics - CoreVideo - OpenGL - Metal - MetalKit - CoreFoundation - ApplicationServices - ]); + buildInputs = + [ + openssl + libjpeg + libopus + ffmpeg + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + glib + libXi + libXcomposite + libXdamage + libXext + libXfixes + libXrender + libXrandr + libXtst + pipewire + mesa + libGL + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + Cocoa + AppKit + IOKit + IOSurface + Foundation + AVFoundation + CoreMedia + VideoToolbox + CoreGraphics + CoreVideo + Metal + MetalKit + CoreFoundation + ApplicationServices + ] + ); - patches = [ - # GCC 12 Fix - (fetchpatch { - url = "https://github.com/desktop-app/tg_owt/pull/101/commits/86d2bcd7afb8706663d29e30f65863de5a626142.patch"; - hash = "sha256-iWS0mB8R0vqPU/0qf6Ax54UCAKYDVCPac2mi/VHbFm0="; - }) - # additional fix for GCC 12 + musl - (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/community/tg_owt/gcc12.patch?id=8120df03fa3b6db5b8ff92c7a52b680290ad6e20"; - hash = "sha256-ikgxUH1e7pz0n0pKUemrPXXa4UkECX+w467M9gU68zs="; - }) + propagatedBuildInputs = [ + abseil-cpp + crc32c + openh264 + libvpx ]; cmakeFlags = [ # Building as a shared library isn't officially supported and may break at any time. - "-DBUILD_SHARED_LIBS=OFF" - ]; - - propagatedBuildInputs = [ - # Required for linking downstream binaries. - abseil-cpp openh264 usrsctp libevent libvpx openssl + (lib.cmakeBool "BUILD_SHARED_LIBS" false) ]; passthru.updateScript = unstableGitUpdater { }; - meta = with lib; { - license = licenses.bsd3; - maintainers = with maintainers; [ oxalica ]; + meta = { + description = "Fork of Google's webrtc library for telegram-desktop"; + homepage = "https://github.com/desktop-app/tg_owt"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ oxalica ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } From 7a776fd27535843f61c3005c9fd5f5c1b790cbca Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 2 Aug 2024 15:06:31 -0400 Subject: [PATCH 12/25] telegram-desktop.tg_owt: 0-unstable-2024-07-30 -> 0-unstable-2024-08-02 Diff: https://github.com/desktop-app/tg_owt/compare/e9d103e2480e0983bf464debc371b049cdd83648...c425281150317753d7bc5182c6572abe20f9a784 (cherry picked from commit 2e0f3715ea35fc16cae8789204dbe4955855e49f) --- .../instant-messengers/telegram/telegram-desktop/tg_owt.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index a552a6da7fdea..20ec6f33c2001 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "0-unstable-2024-07-30"; + version = "0-unstable-2024-08-02"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "e9d103e2480e0983bf464debc371b049cdd83648"; - sha256 = "sha256-EbxQ5JozZM7z9e9ELcqZpuX9rxbk7BrOBM7FRj8T1ec="; + rev = "c425281150317753d7bc5182c6572abe20f9a784"; + sha256 = "sha256-EHQyGE2S2F2UqNl7VDb38pcdv3amm8lGqWZds5ZoHRE="; fetchSubmodules = true; }; From 6c22308c161212eeb266c6e2d5fad5eadea8aa9a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 31 Jul 2024 19:44:38 -0400 Subject: [PATCH 13/25] telegram-desktop: 5.2.3 -> 5.3.0 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.2.3...v5.3.0 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.3.0 (cherry picked from commit 2e7bcd82f2c8cc001ffc82bf25af14a7b4aee2fc) --- .../telegram/telegram-desktop/default.nix | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 0eb675ce69f2e..02f17029b6dba 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -62,14 +62,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.2.3"; + version = "5.3.0"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-VSMSlR3rIUTYQ4GLQrVMZNrSAFfh3aJo6p92xgXMrvo="; + hash = "sha256-RmbMY73tCBZG69tSCZxNiKvqM9pFQObqppcMvyKXqxY="; }; patches = [ @@ -183,13 +183,12 @@ stdenv.mkDerivation (finalAttrs: { }; cmakeFlags = [ - "-Ddisable_autoupdate=ON" + (lib.cmakeBool "DESKTOP_APP_DISABLE_AUTOUPDATE" true) # We're allowed to used the API ID of the Snap package: - "-DTDESKTOP_API_ID=611335" - "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" + (lib.cmakeFeature "TDESKTOP_API_ID" "611335") + (lib.cmakeFeature "TDESKTOP_API_HASH" "d524b414d21f4d37f08684c1df41ac9c") # See: https://github.com/NixOS/nixpkgs/pull/130827#issuecomment-885212649 - "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF" - "-DDESKTOP_APP_DISABLE_SCUDO=ON" + (lib.cmakeBool "DESKTOP_APP_USE_PACKAGED_FONTS" false) ]; preBuild = '' @@ -219,17 +218,17 @@ stdenv.mkDerivation (finalAttrs: { updateScript = nix-update-script { }; }; - meta = with lib; { + meta = { description = "Telegram Desktop messaging app"; longDescription = '' Desktop client for the Telegram messenger, based on the Telegram API and the MTProto secure protocol. ''; - license = licenses.gpl3Only; - platforms = platforms.all; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.all; homepage = "https://desktop.telegram.org/"; - changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}"; - maintainers = with maintainers; [ nickcao ]; + changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${finalAttrs.version}"; + maintainers = with lib.maintainers; [ nickcao ]; mainProgram = if stdenv.hostPlatform.isLinux then "telegram-desktop" else "Telegram"; }; }) From 5d4b3282563a0282b61ed8eea2af02a91f14cd1b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 1 Aug 2024 18:41:54 -0400 Subject: [PATCH 14/25] ada: init at 2.9.0 (cherry picked from commit e6aaa4a4b8cf00c63d358c90193c1bae247d6056) --- pkgs/by-name/ad/ada/package.nix | 37 +++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/ad/ada/package.nix diff --git a/pkgs/by-name/ad/ada/package.nix b/pkgs/by-name/ad/ada/package.nix new file mode 100644 index 0000000000000..dfa948903bc03 --- /dev/null +++ b/pkgs/by-name/ad/ada/package.nix @@ -0,0 +1,37 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, +}: + +stdenv.mkDerivation rec { + pname = "ada"; + version = "2.9.0"; + + src = fetchFromGitHub { + owner = "ada-url"; + repo = "ada"; + rev = "v${version}"; + hash = "sha256-1p9qe7n9dAzJ2opxfBsGXv9IeRdXraHVm7MBXr+QVbQ="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + # uses CPM that requires network access + (lib.cmakeBool "ADA_TOOLS" false) + (lib.cmakeBool "ADA_TESTING" false) + ]; + + meta = { + description = "WHATWG-compliant and fast URL parser written in modern C"; + homepage = "https://github.com/ada-url/ada"; + license = with lib.licenses; [ + asl20 + mit + ]; + maintainers = with lib.maintainers; [ nickcao ]; + platforms = lib.platforms.all; + }; +} From d4cbf0b376e9a3929a2c5e80bd03216e0d9034d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Aug 2024 12:18:51 +0000 Subject: [PATCH 15/25] ada: 2.9.0 -> 2.9.1 (cherry picked from commit d2e91aa8841906d675e0b96a0fc0599ba9ab753b) --- pkgs/by-name/ad/ada/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ad/ada/package.nix b/pkgs/by-name/ad/ada/package.nix index dfa948903bc03..aaf2d31986ffd 100644 --- a/pkgs/by-name/ad/ada/package.nix +++ b/pkgs/by-name/ad/ada/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ada"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "ada-url"; repo = "ada"; rev = "v${version}"; - hash = "sha256-1p9qe7n9dAzJ2opxfBsGXv9IeRdXraHVm7MBXr+QVbQ="; + hash = "sha256-bDkhSAd+MlOm8pd5MPvzVHkWMY9aNcvNfLuH7qoyUuk="; }; nativeBuildInputs = [ cmake ]; From 6b9087b3b5d47a7fd10367953487584a783a7bf3 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 3 Sep 2024 10:11:16 -0400 Subject: [PATCH 16/25] ada: 2.9.1 -> 2.9.2 Diff: https://github.com/ada-url/ada/compare/v2.9.1...v2.9.2 (cherry picked from commit df119bf05be0152ab0a88cc17f42a8017e5c47de) --- pkgs/by-name/ad/ada/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ad/ada/package.nix b/pkgs/by-name/ad/ada/package.nix index aaf2d31986ffd..33ab8e65463dd 100644 --- a/pkgs/by-name/ad/ada/package.nix +++ b/pkgs/by-name/ad/ada/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ada"; - version = "2.9.1"; + version = "2.9.2"; src = fetchFromGitHub { owner = "ada-url"; repo = "ada"; rev = "v${version}"; - hash = "sha256-bDkhSAd+MlOm8pd5MPvzVHkWMY9aNcvNfLuH7qoyUuk="; + hash = "sha256-VWFxupmgc+fq9aj/02uMEsiwhP+9PWMSleoIoyKVe3c="; }; nativeBuildInputs = [ cmake ]; From 97531412b60f55976e82fbd25ec3c4cf3f943de1 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 1 Aug 2024 18:31:28 -0400 Subject: [PATCH 17/25] telegram-desktop: 5.3.0 -> 5.3.1 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.3.0...v5.3.1 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.3.1 (cherry picked from commit e6a2e5b212ab95f9bb8f790a69fa172238c7c782) --- .../telegram/telegram-desktop/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 02f17029b6dba..d481f90f09abd 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -38,6 +38,7 @@ , xdg-utils , microsoft-gsl , rlottie +, ada , stdenv , darwin , lld @@ -62,14 +63,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.3.0"; + version = "5.3.1"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-RmbMY73tCBZG69tSCZxNiKvqM9pFQObqppcMvyKXqxY="; + hash = "sha256-r5cAEoU6PLA5bQgGpyxzU2qKwQ6DC911FYaVbl+9mZA="; }; patches = [ @@ -130,6 +131,7 @@ stdenv.mkDerivation (finalAttrs: { tg_owt microsoft-gsl rlottie + ada ] ++ lib.optionals stdenv.isLinux [ qtwayland gtk3 From 0eec583d281f133260cb07eafbd695b4d88bec0a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 2 Aug 2024 15:07:26 -0400 Subject: [PATCH 18/25] telegram-desktop: 5.3.1 -> 5.3.2 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.3.1...v5.3.2 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.3.2 (cherry picked from commit 9ea6b53e35c8c363484d0632e4529b4174c979d2) --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index d481f90f09abd..15fe94878fc7d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -63,14 +63,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.3.1"; + version = "5.3.2"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-r5cAEoU6PLA5bQgGpyxzU2qKwQ6DC911FYaVbl+9mZA="; + hash = "sha256-fTXZdos0iIHmgWCKOU+B3tpxzLsUUtqx92Od75OdZH8="; }; patches = [ From 30486cf57fd57ab8baa95603523d0a8189581eb2 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 14 Aug 2024 20:49:46 -0400 Subject: [PATCH 19/25] telegram-desktop.tg_owt: 0-unstable-2024-08-02 -> 0-unstable-2024-08-04 Diff: https://github.com/desktop-app/tg_owt/compare/c425281150317753d7bc5182c6572abe20f9a784...dc17143230b5519f3c1a8da0079e00566bd4c5a8 (cherry picked from commit 94bd59582d1408348dfcb15fcc6709fd4af16e14) --- .../instant-messengers/telegram/telegram-desktop/tg_owt.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix index 20ec6f33c2001..64541fc79e97a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "0-unstable-2024-08-02"; + version = "0-unstable-2024-08-04"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "c425281150317753d7bc5182c6572abe20f9a784"; - sha256 = "sha256-EHQyGE2S2F2UqNl7VDb38pcdv3amm8lGqWZds5ZoHRE="; + rev = "dc17143230b5519f3c1a8da0079e00566bd4c5a8"; + sha256 = "sha256-7j7hBIOXEdNJDnDSVUqy234nkTCaeZ9tDAzqvcuaq0o="; fetchSubmodules = true; }; From 41e160c5a5fd4904e77fd66ca4dce862c5114421 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 14 Aug 2024 20:52:03 -0400 Subject: [PATCH 20/25] telegram-desktop: 5.3.2 -> 5.4.0 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.3.2...v5.4.0 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.4.0 (cherry picked from commit 05f5d395cbf275f05a02a1ce7f8d874a81982628) --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 15fe94878fc7d..ed35b9c5823db 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -63,14 +63,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.3.2"; + version = "5.4.0"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-fTXZdos0iIHmgWCKOU+B3tpxzLsUUtqx92Od75OdZH8="; + hash = "sha256-D8ujmAlCz7TPIO+lVJURO2xO73BdCuTtckCWpvbGxEg="; }; patches = [ From 0aeec841c1876f0c9860eb51308ae29293dd7d0b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 17 Aug 2024 15:39:01 -0400 Subject: [PATCH 21/25] telegram-desktop: 5.4.0 -> 5.4.1 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.4.0...v5.4.1 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.4.1 (cherry picked from commit fd5f2f5eb22c7d04cf88838ea232d0a7d6791e36) --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index ed35b9c5823db..4dfe20e94892a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -63,14 +63,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.4.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-D8ujmAlCz7TPIO+lVJURO2xO73BdCuTtckCWpvbGxEg="; + hash = "sha256-AWu0LH6DH/omcIsgIBHQIg1uCKN9Ly6EVj4U9QxoSlg="; }; patches = [ From da63ebda2a54984ed031743ab8e2e8f708f3934d Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 6 Sep 2024 16:05:34 -0400 Subject: [PATCH 22/25] telegram-desktop: 5.4.1 -> 5.5.0 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.4.1...v5.5.0 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.5.0 (cherry picked from commit a9c24b56315cbfb5e379661682d26bd6dd417c00) --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 4dfe20e94892a..ee99f8ade3c34 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -63,14 +63,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.4.1"; + version = "5.5.0"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-AWu0LH6DH/omcIsgIBHQIg1uCKN9Ly6EVj4U9QxoSlg="; + hash = "sha256-0AsdbrW9Kq/Pjd1LBih6GDulFSuF3dWFBfOQ0aAjHtg="; }; patches = [ From 088498fc5aa462d69ac4c0691dc85c0b78b7449c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 6 Sep 2024 16:38:54 -0400 Subject: [PATCH 23/25] telegram-desktop: 5.5.0 -> 5.5.1 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.5.0...v5.5.1 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.5.1 (cherry picked from commit f8cc3b23852d3f09ccadfe45ead4d3834a401db7) --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index ee99f8ade3c34..5cf73100ab563 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -63,14 +63,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.5.0"; + version = "5.5.1"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-0AsdbrW9Kq/Pjd1LBih6GDulFSuF3dWFBfOQ0aAjHtg="; + hash = "sha256-PTa79SbSsOyWlZJ0ad4w6YIiChLzqaSZGRmzyq5qVK0="; }; patches = [ From 53f1e45381a7cb73721403ddd70769a9782f5ed4 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 9 Sep 2024 15:30:05 -0400 Subject: [PATCH 24/25] telegram-desktop: 5.5.1 -> 5.5.2 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.5.1...v5.5.2 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.5.2 (cherry picked from commit 28108159e3ac34437a49c74f59eb225549f08b4c) --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 5cf73100ab563..78d6a1da58ef6 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -63,14 +63,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.5.1"; + version = "5.5.2"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-PTa79SbSsOyWlZJ0ad4w6YIiChLzqaSZGRmzyq5qVK0="; + hash = "sha256-5edk3+RusCq93A6mkzCoegxr6J2fRc9rtGk6IpGHBAY="; }; patches = [ From 2b7ea15fe7e8ab62af735c5a76b075a2aadce161 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Sep 2024 06:27:50 +0000 Subject: [PATCH 25/25] telegram-desktop: 5.5.2 -> 5.5.5 (cherry picked from commit 8a251278699b65a18d3a34b8f6bb48eb0e3ecfb0) --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 78d6a1da58ef6..6aefc520c7e9c 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -63,14 +63,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.5.2"; + version = "5.5.5"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-5edk3+RusCq93A6mkzCoegxr6J2fRc9rtGk6IpGHBAY="; + hash = "sha256-LWIOgyHp43bLN4RQtBKH2HitfVI6AKstPK5es2s+wVw="; }; patches = [