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

[19.03] deepin updates (#58634) #58988

Merged
merged 31 commits into from Apr 7, 2019
Merged

[19.03] deepin updates (#58634) #58988

merged 31 commits into from Apr 7, 2019

Conversation

worldofpeace
Copy link
Contributor

Motivation for this change

Backport: #58634

These deepin packages are broken on 19.03
That's because deepin.qt5dxcb-plugin failed to build.

However these were really out of date, and I don't consider that something
I'd want to have in 19.03

Notes

There were some differences that needed correction and a few conflicts.
But I've resolved them.

This change introduces the following packages:

This change omits the following commits from the original pr:

That's because they're unneeded additions for 19.03.

Things done

I've ran nix-review locally.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@romildo @worldofpeace
xcur2png: init at 0.7.1
956069f 
(cherry picked from commit 4d5a4a6)
@romildo @worldofpeace
blur-effect: init at 1.1.3
a2b904f 
(cherry picked from commit 56488c9)
@romildo @worldofpeace
deepin: add setup hook with helper functions
3033f19 
(cherry picked from commit 0a971b5)
@romildo @worldofpeace
deepin.dde-session-ui: 4.6.2 -> 4.9.0
b1fa165 
(cherry picked from commit 4a00f98)
@romildo @worldofpeace
deepin.dde-api: 3.5.0 -> 3.18.1
df2e1f4 
(cherry picked from commit 5c38dbd)
@romildo @worldofpeace
deepin.dde-daemon: 3.6.0 -> 3.24.1
3f95e5e 
(cherry picked from commit 8532ff4)
@romildo @worldofpeace
deepin.deepin-desktop-schemas: 3.4.0 -> 3.13.0
7e05b40 
(cherry picked from commit 0215ee0)
@romildo @worldofpeace
deepin.deepin-icon-theme: 15.12.64 -> 15.12.68
e476e0c 
(cherry picked from commit ad75a1f)
@romildo @worldofpeace
deepin.deepin-image-viewer: 1.3.1 -> 1.3.10
e41f449 
(cherry picked from commit eb25703)
@romildo @worldofpeace
deepin.deepin-movie-reborn: 3.2.14 -> 3.2.21
0299794 
(cherry picked from commit 87c4c58)
@romildo @worldofpeace
deepin.deepin-terminal: 3.0.10.2 -> 3.2.1.2
90b0d51 
(cherry picked from commit 7853a9a)
@romildo @worldofpeace
deepin.dtkcore: 2.0.9.8 -> 2.0.10
9dfc5ed 
(cherry picked from commit 2512540)
@romildo @worldofpeace
deepin.go-dbus-factory: 0.0.7.1 -> 0.4.0
7c6f48f 
(cherry picked from commit 9de5aa7)
@romildo @worldofpeace
deepin.go-lib: 1.3.0 -> 1.10.0
6530d4f 
(cherry picked from commit 62b5734)
@romildo @worldofpeace
deepin.qt5dxcb-plugin: 1.1.13 -> 1.1.25
33dc7c7 
(cherry picked from commit 4ac85ab)
@romildo @worldofpeace
deepin.qt5integration: 0.3.6 -> 0.3.8
30ee47c 
(cherry picked from commit 8e4a7e3)
@romildo @worldofpeace
deepin.deepin-mutter: 3.20.35 -> 3.20.38
e87f02a 
(cherry picked from commit 8c80fca)
@romildo @worldofpeace
deepin.deepin-wm: 1.9.34 -> 1.9.37
932a90f 
(cherry picked from commit 4846803)
@romildo @worldofpeace
deepin.deepin-desktop-base: 2018.10.29 -> 2019.03.29
41b44a3 
(cherry picked from commit 8b09ef4)
@romildo @worldofpeace
deepin.deepin-wallpapers: 1.7.5 -> 1.7.7
eaa183f 
(cherry picked from commit c40f6d1)
@romildo @worldofpeace
deepin.deepin-metacity: 3.22.22 -> 3.22.24
77b4a1c 
(cherry picked from commit 091b13a)
@romildo @worldofpeace
deepin.go-gir-generator: 1.1.0 -> 2.0.0
524cf2e 
(cherry picked from commit 0d065db)
@romildo @worldofpeace
deepin.dtkwidget: 2.0.9.15 -> 2.0.10
370c51f 
(cherry picked from commit 52b8a85)
@romildo @worldofpeace
deepin.dde-qt-dbus-factory: 1.0.5 -> 1.1.1
1c4e91b 
(cherry picked from commit 9485d5e)
@romildo @worldofpeace
deepin.dbus-factory: use ${placeholder ''out''} instead of $(out)
24ba9e1 
(cherry picked from commit 7f396b7)
@romildo @worldofpeace
deepin.deepin-gettext-tools: use ${placeholder ''out''} instead of $(…
2965e31 
…out)

(cherry picked from commit 484e604)
@romildo @worldofpeace
deepin.deepin-gtk-theme: use ${placeholder ''out''} instead of $(out)
5e3aa2d 
(cherry picked from commit 3611a3e)
@romildo @worldofpeace
deepin.deepin-sound-theme: use ${placeholder ''out''} instead of $(out)
f84c69d 
(cherry picked from commit eb529d9)
@romildo @worldofpeace
deepin.go-dbus-generator: use ${placeholder ''out''} instead of $(out)
8d280a4 
(cherry picked from commit b08aff1)
@romildo @worldofpeace
deepin.dde-calendar: fix use of patchShebangs
aad0d74 
(cherry picked from commit a1bf396)
@worldofpeace worldofpeace added the 8.has: port to stable A PR already has a backport to the stable release. label Apr 5, 2019
romildo
romildo approved these changes Apr 5, 2019
View reviewed changes
Copy link
Contributor

@romildo romildo left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@lheckemann
Copy link
Member

lheckemann commented Apr 7, 2019 •
edited

@GrahamcOfBorg build deepin.deepin-terminal

@lheckemann lheckemann merged commit d6fc310 into NixOS:release-19.03 Apr 7, 2019
@worldofpeace worldofpeace deleted the deepin-backport branch April 7, 2019 21:03
@worldofpeace
Copy link
Contributor Author

Thanks @lheckemann

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

@romildo romildo romildo approved these changes

@samueldr samueldr Awaiting requested review from samueldr

@lheckemann lheckemann Awaiting requested review from lheckemann

Assignees
No one assigned
Labels
8.has: package (new) 8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@worldofpeace @lheckemann @romildo @GrahamcOfBorg