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
base: d5f9a98e0610
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: f430ac79b87b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 18, 2020

  1. tdesktop: 1.8.15 -> 1.9.3 

    The GYP build is now deprecated [0].
This results in a large number of changes and many custom Nix patches
aren't required anymore (and probably haven't been required for quite
some time now, the derivation got a bit outdated...).

A lot of the changes in this commit are based on the changes of the
Arch package [1][2] (which our package is based upon).

Rough overview of the changes:
- gcc9 -> ninja (optional but let's follow Arch here)
- Dropped GYP, only CMake now
  - But: Python is still required
- fetchFromGitHub -> fetchurl (optional?)
- Apply all Arch patches and remove old patches
  - Requires one new patch for range-v3
- New dependencies: enchant2, lz4, xxHash
  - TODO: Plus a few new dependencies that shouldn't be required
- Cleanup: Irrelevant flags (e.g. GYP_DEFINES) and patches (e.g. sed)
  - Simplifies quite a few things :)
- Some additional documentation and TODOs

Co-Authored-By: Jan Tojnar <jtojnar@gmail.com>

[0]: telegramdesktop/tdesktop#7001
[1]: https://git.archlinux.org/svntogit/community.git/commit/?id=23eff2b1ef7435441e93120618ca899f0b0e7e61
[2]: https://git.archlinux.org/svntogit/community.git/commit/?id=6a19e949724b2e2bfcdcf2081111ecd46108e449
    @primeos
    primeos committed Jan 18, 2020
    Copy the full SHA
    1835ac1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #77453 from primeos/tdesktop 

    tdesktop: 1.8.15 -> 1.9.3
    @primeos
    primeos committed Jan 18, 2020
    Copy the full SHA
    f430ac7 View commit details
    Browse the repository at this point in the history