Skip to content

[Backport release-24.11] deepin desktop environment: 2024.12 update#371369

Merged
vcunat merged 20 commits intostaging-next-24.11from
backport-363854-to-release-24.11
Jan 6, 2025
Merged

[Backport release-24.11] deepin desktop environment: 2024.12 update#371369
vcunat merged 20 commits intostaging-next-24.11from
backport-363854-to-release-24.11

Conversation

@nixpkgs-ci
Copy link
Contributor

@nixpkgs-ci nixpkgs-ci bot commented Jan 6, 2025

Bot-based backport to release-24.11, triggered by a label in #363854.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-commiter, if you find that it is not acceptable, leave a comment.

DimitarNestorov and others added 20 commits January 4, 2025 13:30
@DimitarNestorov
Revert "treewide: format all inactive Nix files" for changedetection-io
6a4e303 
Commit d9d87c5
@r-ryantm @DimitarNestorov
changedetection-io: 0.47.06 -> 0.48.01
b8308e7 
(cherry picked from commit e7e2a79)
@DimitarNestorov
changedetection-io: format
fc4cb70
@r-ryantm @DimitarNestorov
changedetection-io: 0.48.01 -> 0.48.05
570d0e8 
(cherry picked from commit 9f95a71)
@emilazy
[Backport release-24.11] changedetection-io: 0.47.06 -> 0.48.05 (#370831
667cf6d 
)
@DamienCassou @github-actions
emacs30.pkgs.aio: Fix build
706e9cb 
(cherry picked from commit c309e66)
@adisbladis
[Backport release-24.11] emacs30.pkgs.aio: Fix build (#371346)
2192215
@PatrickDaG @github-actions
nixos/netbird: fix state directory mode
af76d3d 
(cherry picked from commit 8e44bd9)
@drupol
[Backport release-24.11] nixos/netbird: fix state directory mode (#37…
e967d84 
…1351)
@wineee @github-actions
deepin.dtk6core: 6.0.19 -> 6.0.24
f63fa10 
(cherry picked from commit 0852cf6)
@wineee @github-actions
deepin.dde-application-manager: 1.2.15 -> 1.2.19
7d1a426 
(cherry picked from commit c172f47)
@wineee @github-actions
deepin.dtk6gui: 6.0.19 -> 6.0.24
f11d11c 
(cherry picked from commit 149b50f)
@wineee @github-actions
deepin.dtk6widget: 6.0.19 -> 6.0.24
a11e629 
(cherry picked from commit de5566c)
@wineee @github-actions
deepin.dtk6declarative: 6.0.19 -> 6.0.24
d2dd375 
(cherry picked from commit 55c4bd3)
@wineee @github-actions
deepin.qt6integration: 6.0.19 -> 6.0.24
1a5ae4f 
(cherry picked from commit 4ed970f)
@wineee @github-actions
deepin.qt6platform-plugins: 6.0.19 -> 6.0.24
68216a6 
(cherry picked from commit c66a709)
@wineee @github-actions
deepin.treeland-protocols: init at 0.4.5
cfef7b8 
(cherry picked from commit 49a4f19)
@wineee @github-actions
deepin.dde-tray-loader: 1.0.1 -> 1.0.7
e151c98 
(cherry picked from commit d384030)
@wineee @github-actions
deepin.dde-shell: 1.0.2 -> 1.0.9
0166e10 
(cherry picked from commit 16db3c0)
@wineee @github-actions
deepin.dde-launchpad: 1.0.2 -> 1.0.8
4f89eb9 
(cherry picked from commit 110658a)
@nixpkgs-ci nixpkgs-ci bot mentioned this pull request Jan 6, 2025
Merged
13 tasks
@vcunat vcunat marked this pull request as draft January 6, 2025 09:17
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Jan 6, 2025
@vcunat
Copy link
Member

vcunat commented Jan 6, 2025 •
edited
Loading

deepin.dtk6core build got broken, most likely after update of qt6 in PR #363695. Picking the update in fe7eff0 seems to have fixed all deepin builds, but... I expect it's up to @wineee whether more of these updates are better to pick as well to 24.11.

The whole thing is in PR #369690 now, but that will most likely get into nixos-24.11 within days.

@wineee
Copy link
Member

wineee commented Jan 6, 2025 •
edited
Loading

This is enough to fix build. However, the dde-shell plugin is prone to crash in qt 6.8., it's better to has #370520 (still in staging)

@wineee wineee marked this pull request as ready for review January 6, 2025 10:06
@vcunat
Copy link
Member

vcunat commented Jan 6, 2025

Hydra agrees that builds are OK with just that single commit:
https://hydra.nixos.org/eval/1810876?filter=deepin

@vcunat vcunat changed the base branch from release-24.11 to staging-next-24.11 January 6, 2025 13:18
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: emacs Text editor labels Jan 6, 2025
@vcunat vcunat merged commit 474d1e4 into staging-next-24.11 Jan 6, 2025
27 of 28 checks passed
@vcunat vcunat deleted the backport-363854-to-release-24.11 branch January 6, 2025 13:19
@vcunat
Copy link
Member

vcunat commented Jan 6, 2025

OK. I'll trust your review and pull this. I'm sorry about GitHub UI confusing the PR now with a few unrelated commits from release-24.11.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wineee wineee wineee approved these changes

Assignees

No one assigned

Labels

6.topic: emacs Text editor 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@vcunat @wineee @DimitarNestorov @r-ryantm @emilazy @DamienCassou @adisbladis @PatrickDaG @drupol