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: 7ff17ce730c4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9004c0b01770
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 4, 2019

  1. tdesktop: 1.8.9 -> 1.8.13

    @primeos
    primeos committed Oct 4, 2019
    Copy the full SHA
    c1b1270 View commit details

  2. range-v3: 0.5.0 -> 0.9.1 

    Was too outdated for tdesktop:

/build/source/Telegram/SourceFiles/ui/image/image_prepare.cpp: In function 'QImage Images::BlurLargeImage(QImage, int)':
/build/source/Telegram/SourceFiles/ui/image/image_prepare.cpp:265:81: error: expected primary-expression before ')' token
  265 |  for (auto &&[value, index] : ranges::view::zip(dvs, ints(0, ranges::unreachable))) {
      |                                                                                 ^
    @primeos
    primeos committed Oct 4, 2019
    Copy the full SHA
    1038822 View commit details

  3. Merge pull request #70414 from primeos/tdesktop 

    tdesktop: 1.8.9 -> 1.8.13, range-v3: 0.5.0 -> 0.9.1
    @abbradar
    abbradar authored Oct 4, 2019
    Copy the full SHA
    9004c0b View commit details
Showing with 14 additions and 13 deletions.
  1. +11 −10 pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
  2. +3 −3 pkgs/development/libraries/range-v3/default.nix
21 changes: 11 additions & 10 deletions pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ with lib;

mkDerivation rec {
pname = "telegram-desktop";
version = "1.8.9";
version = "1.8.13";
# Note: Due to our strong dependency on the Arch patches it's probably best
# to also wait for the Arch update (especially if the patches don't apply).

@@ -17,16 +17,16 @@ mkDerivation rec {
owner = "telegramdesktop";
repo = "tdesktop";
rev = "v${version}";
sha256 = "0b1c903ah3fhxr9qjg23p8x9k895k3cxkzz5ckcr7r4pmmbnnvkp";
sha256 = "19p4cjzk7jyhrd4sd8dq1r1zksff23zyg5rh5vlr3kqd372bffzz";
fetchSubmodules = true;
};

# Arch patches (svn export telegram-desktop/trunk)
archPatches = fetchsvn {
url = "svn://svn.archlinux.org/community/telegram-desktop/trunk";
# svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
rev = "509240";
sha256 = "1sf4mspbsqsnjzp9ys9l0asrx1bhj273d163i2bv1zhl4mmgpl3k";
rev = "512849";
sha256 = "1hl7znvv6qr4cwpkj8wlplpa63i1lhk2iax7hb4l1s1a4mijx9ls";
};
privateHeadersPatch = fetchpatch {
url = "https://github.com/telegramdesktop/tdesktop/commit/b9d3ba621eb8af638af46c6b3cfd7a8330bf0dd5.patch";
@@ -38,8 +38,10 @@ mkDerivation rec {
patches = [
"${archPatches}/tdesktop.patch"
"${archPatches}/no-gtk2.patch"
# "${archPatches}/Use-system-wide-font.patch"
"${archPatches}/Revert-Disable-DemiBold-fallback-for-Semibold.patch"
"${archPatches}/tdesktop_lottie_animation_qtdebug.patch"
# "${archPatches}/Revert-Change-some-private-header-includes.patch"
# "${archPatches}/Use-system-wide-font.patch"
];

postPatch = ''
@@ -87,7 +89,6 @@ mkDerivation rec {

preConfigure = ''
# Patches to revert:
patch -R -Np1 -i "${archPatches}/demibold.patch"
patch -R -Np1 -i "${privateHeadersPatch}"
# Patches to apply:
@@ -98,17 +99,17 @@ mkDerivation rec {
# disable static-qt for rlottie
sed "/RLOTTIE_WITH_STATIC_QT/d" -i "Telegram/gyp/lib_rlottie.gyp"
sed -i Telegram/gyp/telegram_linux.gypi \
sed -i Telegram/gyp/telegram/linux.gypi \
-e 's,/usr,/does-not-exist,g' \
-e 's,appindicator-0.1,appindicator3-0.1,g' \
-e 's,-flto,,g'
sed -i Telegram/gyp/qt.gypi \
sed -i Telegram/gyp/modules/qt.gypi \
-e "s,/usr/include/qt/QtCore/,${qtbase.dev}/include/QtCore/,g" \
-e 's,\d+",\d+" | head -n1,g'
sed -i Telegram/gyp/qt_moc.gypi \
sed -i Telegram/gyp/modules/qt_moc.gypi \
-e "s,/usr/bin/moc,moc,g"
sed -i Telegram/gyp/qt_rcc.gypi \
sed -i Telegram/gyp/modules/qt_rcc.gypi \
-e "s,/usr/bin/rcc,rcc,g"
# Build system assumes x86, but it works fine on non-x86 if we patch this one flag out
6 changes: 3 additions & 3 deletions pkgs/development/libraries/range-v3/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "range-v3";
version = "0.5.0";
version = "0.9.1";

src = fetchFromGitHub {
owner = "ericniebler";
repo = "range-v3";
rev = version;
sha256 = "0fzbpaa4vwlivi417zxm1d6v4lkp5c9f5bd706nn2fmw3zxjj815";
sha256 = "0qga2fnfrlrzrvnnk1z1plpmvcr8b4c75g5xz0jv0sav0kmq5zwn";
};

nativeBuildInputs = [ cmake ];
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
homepage = https://github.com/ericniebler/range-v3;
license = licenses.boost;
platforms = platforms.all;
maintainers = with maintainers; [ xwvvvvwx ];
maintainers = with maintainers; [ primeos xwvvvvwx ];
};
}