tdesktop 4.6.5 -> 4.7.1 https://github.com/telegramdesktop/tdesktop/releases attrpath: tdesktop Checking auto update branch... [version] [version] generic version rewriter does not support multiple hashes [rustCrateVersion] [rustCrateVersion] No cargoSha256 or cargoHash found [golangModuleVersion] [golangModuleVersion] Not a buildGoModule package with vendorSha256 or vendorHash [updateScript] [updateScript] Success [updateScript] this derivation will be built: /nix/store/w27srdn2xk9nwbzkqvsfaxbj42lc5rw0-packages.json.drv building '/nix/store/w27srdn2xk9nwbzkqvsfaxbj42lc5rw0-packages.json.drv'... Going to be running update for following packages: - telegram-desktop-4.6.5 Press Enter key to continue... Running update for: - telegram-desktop-4.6.5: UPDATING ... - telegram-desktop-4.6.5: DONE. Packages updated! [quotedUrls] [quotedUrls] nothing found to replace Diff after rewrites: diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 648af9a92de..835e2197e18 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "4.6.5"; + version = "4.7.1"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0c65ry82ffmh1qzc2lnsyjs78r9jllv62p9vglpz0ikg86zf36sk"; + sha256 = "1qv8029xzp2j1j58b1lkw3q53cwaaazvp2la80mfbjv348c29iyk"; }; patches = [ diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix index 713069ff95a..873ae69ec4e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/tg_owt.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2023-01-05"; + version = "unstable-2023-04-01"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "5098730b9eb6173f0b52068fe2555b7c1015123a"; - sha256 = "0dnh0l9qb9q43cvm4wfgmgqp48grqqz9fb7f48nvys1b6pzhh3pk"; + rev = "d85b53d12e9f32e3fd556a247af16b1a52a4a565"; + sha256 = "1alddgl1dj8sc2w6agmaflakazphk3rsin7vvnky1z4j3vpi7pls"; fetchSubmodules = true; }; No auto update branch exists Old version 4.6.5" not present in master derivation file with contents: { lib , fetchFromGitHub , fetchpatch , fetchurl , callPackage , pkg-config , cmake , ninja , python3 , wrapGAppsHook , wrapQtAppsHook , extra-cmake-modules , qtbase , qtwayland , qtsvg , qtimageformats , qt5compat , gtk3 , libdbusmenu , lz4 , xxHash , ffmpeg , openalSoft , minizip , libopus , alsa-lib , libpulseaudio , pipewire , range-v3 , tl-expected , hunspell , glibmm_2_68 , webkitgtk_4_1 , jemalloc , rnnoise , protobuf , abseil-cpp # Transitive dependencies: , util-linuxMinimal , pcre , libpthreadstubs , libXdamage , libXdmcp , libselinux , libsepol , libepoxy , at-spi2-core , libXtst , libthai , libdatrie , xdg-utils , xorg , libsysprof-capture , libpsl , brotli , microsoft_gsl , rlottie , stdenv }: # Main reference: # - This package was originally based on the Arch package but all patches are now upstreamed: # https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/telegram-desktop # Other references that could be useful: # - https://git.alpinelinux.org/aports/tree/testing/telegram-desktop/APKBUILD # - https://github.com/void-linux/void-packages/blob/master/srcpkgs/telegram-desktop/template let tg_owt = callPackage ./tg_owt.nix { abseil-cpp = abseil-cpp.override { cxxStandard = "20"; }; }; glibmm = glibmm_2_68.overrideAttrs (_: { version = "2.76.0"; src = fetchurl { url = "mirror://gnome/sources/glibmm/2.76/glibmm-2.76.0.tar.xz"; sha256 = "sha256-hjfYDOq9lP3dbkiXCggqJkVY1KuCaE4V/8h+fvNGKrI="; }; }); in stdenv.mkDerivation rec { pname = "telegram-desktop"; version = "4.7.1"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; sha256 = "1qv8029xzp2j1j58b1lkw3q53cwaaazvp2la80mfbjv348c29iyk"; }; patches = [ # 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="; }) ]; postPatch = '' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' substituteInPlace Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp \ --replace '"libwebkit2gtk-4.1.so.0"' '"${webkitgtk_4_1}/lib/libwebkit2gtk-4.1.so.0"' ''; # We want to run wrapProgram manually (with additional parameters) dontWrapGApps = true; dontWrapQtApps = true; nativeBuildInputs = [ pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook extra-cmake-modules ]; buildInputs = [ qtbase qtwayland qtsvg qtimageformats qt5compat gtk3 libdbusmenu lz4 xxHash ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio pipewire range-v3 tl-expected hunspell glibmm webkitgtk_4_1 jemalloc rnnoise protobuf tg_owt # Transitive dependencies: util-linuxMinimal # Required for libmount thus not nativeBuildInputs. pcre libpthreadstubs libXdamage libXdmcp libselinux libsepol libepoxy at-spi2-core libXtst libthai libdatrie libsysprof-capture libpsl brotli microsoft_gsl rlottie ]; cmakeFlags = [ "-Ddisable_autoupdate=ON" # We're allowed to used the API ID of the Snap package: "-DTDESKTOP_API_ID=611335" "-DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c" # See: https://github.com/NixOS/nixpkgs/pull/130827#issuecomment-885212649 "-DDESKTOP_APP_USE_PACKAGED_FONTS=OFF" ]; postFixup = '' # This is necessary to run Telegram in a pure environment. # We also use gappsWrapperArgs from wrapGAppsHook. wrapProgram $out/bin/telegram-desktop \ "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \ --prefix LD_LIBRARY_PATH : "${xorg.libXcursor}/lib" \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} \ --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" sed -i $out/bin/telegram-desktop \ -e "s,'XDG-RUNTIME-DIR',\"\''${XDG_RUNTIME_DIR:-/run/user/\$(id --user)}\"," ''; passthru = { inherit tg_owt; updateScript = ./update.py; }; meta = with lib; { 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.linux; homepage = "https://desktop.telegram.org/"; changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}"; maintainers = with maintainers; [ nickcao ]; }; }