Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 82470c2e3b84
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a47c3b32abf7
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Dec 24, 2018

  1. tdesktop: 1.5.3 -> 1.5.4 

    tdesktopPackages.preview: 1.5.3 -> 1.5.4
    @primeos
    primeos committed Dec 24, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a47c3b3 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ let
mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
stableVersion = {
stable = true;
version = "1.5.3";
sha256Hash = "13gl81zb9739hs7p3pfavr2lcikajljf03g2x3zgcb9zyarwffg4";
version = "1.5.4";
sha256Hash = "0a52m5qkvk01yl3za3k7pccjrqkr8gbxqnj5lnhh1im1pdxqwh4m";
# svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
archPatchesRevision = "415526";
archPatchesHash = "1lfzws90ab0vajhm5r64gyyqqc1g6a2ay0a1vkp0ah1iw5jh11ik";
6 changes: 1 addition & 5 deletions pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stable, version, sha256Hash, archPatchesRevision, archPatchesHash }:

{ mkDerivation, lib, fetchFromGitHub, fetchsvn, fetchpatch
{ mkDerivation, lib, fetchFromGitHub, fetchsvn
, pkgconfig, pythonPackages, cmake, wrapGAppsHook
, qtbase, qtimageformats, gtk3, libappindicator-gtk3, libnotify, xdg_utils
, dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3
@@ -31,10 +31,6 @@ mkDerivation rec {
# TODO: libtgvoip.patch no-gtk2.patch
patches = [
"${archPatches}/tdesktop.patch"
(fetchpatch {
url = "https://github.com/telegramdesktop/tdesktop/commit/4e692e2c1e10538d7fd3e7c0e0a66e0ba474fe76.patch";
sha256 = "11pv7ib56aq69q9257b9p7wxd2f8xcr6mavswzqw0lndvcx8a5dz";
})
]
# TODO: Only required to work around a compiler bug.
# This should be fixed in GCC 7.3.1 (or later?)