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

deepin.dde-control-center: init at 5.6.3 #219121

Merged
merged 1 commit into from Mar 30, 2023
Merged

deepin.dde-control-center: init at 5.6.3 #219121

merged 1 commit into from Mar 30, 2023

Conversation

wineee
Copy link
Member

@wineee wineee commented Mar 2, 2023 •
edited

Description of changes

linuxdeepin/dde-nixos#9

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/)
  • 23.05 Release Notes (or backporting 22.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
  • Fits CONTRIBUTING.md.

@wineee wineee force-pushed the deepin-core branch 2 times, most recently from 28f26c2 to 8b97121 Compare March 2, 2023 07:27
@wineee wineee force-pushed the deepin-core branch 2 times, most recently from 9a830a9 to 9e23bb3 Compare March 2, 2023 07:49
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/1916

SuperSandro2000
SuperSandro2000 reviewed Mar 8, 2023
View reviewed changes
pkgs/desktops/deepin/core/dde-control-center/default.nix
sha256 = "sha256-r21oczFyhKarMuEkL8Ruzd8jqB/T+MfuUGrLNeQdZB8=";
})
./fix-svg-render-for-themeitem.patch
./dont-show-endUserLicenseAgreement-for-deepinos.patch
Copy link
Member

Choose a reason for hiding this comment

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

This feels a bit sketchy to do

Copy link
Member Author

Choose a reason for hiding this comment

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

Should I replace the text？I don't find endUserLicenseAgreement for NixOS,

Copy link
Member Author

Choose a reason for hiding this comment

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

User-Experience-Program-License-Agreement-Community.md comes from a non-open source component（deepin-deepinid-client），It's only blank page if we didn't install deepin-deepinid-client

dde-control-center 6.0.0 is completely rewritten，not based on 5.6.*, so this patch cannot merge by upstream

Copy link
Member

Choose a reason for hiding this comment

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

Can you add a short comment with that info and a link to the upstream commit that removed it?

Copy link
Member Author

Choose a reason for hiding this comment

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

Comment has been added. dde-control-center 6.0.0 is not a simple version upgrade, but a rewrite，this patch will remove in future

@wineee wineee force-pushed the deepin-core branch 3 times, most recently from d5a4db5 to a4bf38d Compare March 12, 2023 15:41
@wineee wineee changed the title deepin.dde-control-center: init at 5.5.164 deepin.dde-control-center: init at 5.6.3 Mar 17, 2023
@wineee wineee force-pushed the deepin-core branch 3 times, most recently from 8b4ab9f to 60149d9 Compare March 20, 2023 02:06
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/2003

@SuperSandro2000 SuperSandro2000 merged commit 951d87b into NixOS:master Mar 30, 2023
@wineee wineee deleted the deepin-core branch March 30, 2023 15:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@wineee @nixos-discourse @SuperSandro2000