Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tdesktop: 3.1.11 -> 3.4.3 #152702

Merged
merged 1 commit into from Jan 4, 2022
Merged

tdesktop: 3.1.11 -> 3.4.3 #152702

merged 1 commit into from Jan 4, 2022

Conversation

MrMebelMan
Copy link
Contributor

Motivation for this change

Update to a new version

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@MrMebelMan
Copy link
Contributor Author

image
I've encountered this issue while trying to test the new version, but I'm not sure what to do about it 👉👈

@ofborg ofborg bot requested review from oxalica, primeos and VergeDX December 30, 2021 13:57
@Kranzes
Copy link
Member

Kranzes commented Dec 30, 2021

TDesktop now depends on qt6, which is not available in nixpkgs currently.
See: #141883

VergeDX
VergeDX suggested changes Dec 30, 2021
View reviewed changes
Copy link
Member

@VergeDX VergeDX left a comment •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try to add "-DDESKTOP_APP_QT6=OFF" in cmakeFlags.

@VergeDX
Copy link
Member

VergeDX commented Dec 31, 2021

3.4.0 is released, I quickly tried it and seems everything is ok.
Please update to the latest, and skip qt6 requirement while building.

@MrMebelMan
Copy link
Contributor Author

Updated to 3.4.0. Everything seems to work well, thanks @Kranzes & @VergeDX ❤️

@MrMebelMan MrMebelMan changed the title tdesktop: 3.1.11 -> 3.3.0 tdesktop: 3.1.11 -> 3.4.0 Dec 31, 2021
@ofborg ofborg bot requested a review from VergeDX December 31, 2021 07:49
@Kranzes
Copy link
Member

Kranzes commented Dec 31, 2021 •
edited

Add a TODO comment above where you disabled QT6, something like "Remove once QT6 is available in nixpkgs".
Also, 3.4.1 was just released :)

@MrMebelMan
Copy link
Contributor Author

Jesus

@MrMebelMan MrMebelMan changed the title tdesktop: 3.1.11 -> 3.4.0 tdesktop: 3.1.11 -> 3.4.1 Dec 31, 2021
@ofborg ofborg bot requested a review from VergeDX December 31, 2021 11:49
@ofborg ofborg bot removed the request for review from 1000101 December 31, 2021 14:48
@1000101
Copy link
Member

1000101 commented Dec 31, 2021 •
edited

IT WOKZ

Result of nixpkgs-review pr 152702 run on x86_64-linux 1

1 package built:
  • tdesktop

@MrMebelMan
Copy link
Contributor Author

IT WOKZ

Result of nixpkgs-review pr 152702 run on x86_64-linux 1
1 package built:

DIKI

@MrMebelMan
Copy link
Contributor Author

Happy COVID-22, sirs! 🎉

@VergeDX
Copy link
Member

VergeDX commented Jan 1, 2022

3.4.2 plz xD

@1000101
Copy link
Member

1000101 commented Jan 1, 2022 •
edited

3.4.2 plz xD

Now that's some agile development!

3.4.1:

Bug fixes and other minor improvements.

3.4.2:

Bug fixes and other minor improvements.

3.4.3:
WEN

@MrMebelMan
Copy link
Contributor Author

WHY ARE YOU DOING THIS TO ME

@1000101
Copy link
Member

1000101 commented Jan 2, 2022

WHY ARE YOU DOING THIS TO ME

@MrMebelMan commit it before it lays more versions

@MrMebelMan MrMebelMan changed the title tdesktop: 3.1.11 -> 3.4.1 tdesktop: 3.1.11 -> 3.4.2 Jan 2, 2022
@MrMebelMan
Copy link
Contributor Author

shouldnt

@1000101
Copy link
Member

1000101 commented Jan 2, 2022

Result of nixpkgs-review pr 152702 run on x86_64-linux 1

1 package built:
  • tdesktop

@VergeDX VergeDX self-requested a review January 2, 2022 14:52
@VergeDX
Copy link
Member

VergeDX commented Jan 2, 2022

The aarch64 build failed with internal complier error (ICE).
Idk what happened, I'll check out this tomorrow : (

@VergeDX
Copy link
Member

VergeDX commented Jan 3, 2022

The default cc of aarch64 is gcc9 (x86_64 on is gcc10), which caused the ICE.
I switch to gcc10Stdenv and compile it in arm64 Drone CI, it seems the error disappeared.

The commit: https://github.com/VergeDX/nixpkgs/commit/687d6cc5da37725834991c268ea2d7523140d401#diff-a45a9e94415ea5231fbac619e3eca6614b75e730f93f5986c163fc9304242517R69
The CI log: https://cloud.drone.io/VergeDX/actions-nix/9/1/2

@ajs124
Copy link
Member

ajs124 commented Jan 3, 2022

The default cc of aarch64 is gcc9 (x86_64 on is gcc10), which caused the ICE. I switch to gcc10Stdenv and compile it in arm64 Drone CI, it seems the error disappeared.

For reference #108305

@MrMebelMan
Copy link
Contributor Author

Thanks @VergeDX, u da boss

@1000101
Copy link
Member

1000101 commented Jan 3, 2022 •
edited

image

https://github.com/telegramdesktop/tdesktop/releases/tag/v3.4.3

    Bug fixes and other minor improvements.

chuahou added a commit to ch-fork/nixpkgs that referenced this pull request Jan 4, 2022
@chuahou
tdesktop: 3.1.11 -> 3.4.2 NixOS#152702
f13ae59
@ofborg ofborg bot requested a review from VergeDX January 4, 2022 05:10
@MrMebelMan
Copy link
Contributor Author

We need to hurry, comerades - 3.4.4 is brewing image

@MrMebelMan MrMebelMan changed the title tdesktop: 3.1.11 -> 3.4.2 tdesktop: 3.1.11 -> 3.4.3 Jan 4, 2022
@1000101
Copy link
Member

1000101 commented Jan 4, 2022

Result of nixpkgs-review pr 152702 run on x86_64-linux 1

1 package built:
  • tdesktop

@mmahut mmahut merged commit 2fe2069 into NixOS:master Jan 4, 2022
@MrMebelMan MrMebelMan deleted the update/tdesktop branch January 4, 2022 22:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@1000101 1000101 1000101 approved these changes

@VergeDX VergeDX VergeDX approved these changes

@oxalica oxalica Awaiting requested review from oxalica

@primeos primeos Awaiting requested review from primeos

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@MrMebelMan @Kranzes @VergeDX @1000101 @ajs124 @mmahut