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.

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

[20.09] Cinnamon backports #101768

Merged
merged 7 commits into from Oct 26, 2020
Merged

[20.09] Cinnamon backports #101768

merged 7 commits into from Oct 26, 2020

Conversation

worldofpeace
Copy link
Contributor

Motivation for this change

Doing some backports with @mkg20001. TBH I'm fine also helping maintain this desktop since it probably won't be that much work since I'm familiar with similar codebases.

We actually need to make a commit on master before we merge this to fix #101767

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

mkg20001 and others added 6 commits October 26, 2020 10:36
@mkg20001 @worldofpeace
cinnamon.cinnamon-common: add patch for new cjs
d5d5a70 
(cherry picked from commit 1e80ede)
@mkg20001 @worldofpeace
cinnamon.cjs: 4.6.0 -> 4.6.0-gjs1.66.0
f5ea85f 
(cherry picked from commit b77e830)
@r-ryantm @worldofpeace
cinnamon.cinnamon-desktop: 4.6.1 -> 4.6.4
b223f2c 
(cherry picked from commit 79c6d40)
@r-ryantm @worldofpeace
cinnamon.cinnamon-menus: 4.6.0 -> 4.6.1
a53b4f8 
(cherry picked from commit 4078818)
@r-ryantm @worldofpeace
cinnamon.cinnamon-session: 4.6.1 -> 4.6.2
7b97ce6 
(cherry picked from commit 7e6fd55)
@worldofpeace
cinnamon.cjs: don't use fork, 4.6.0 -> 2020-10-19
53b104b 
The code in that fork was been integrated into cjs master linuxmint/cjs#84

(cherry picked from commit feac386)
@worldofpeace
Copy link
Contributor Author

pulling in #101769

mkg20001
mkg20001 requested changes Oct 26, 2020
View reviewed changes
Copy link
Member

@mkg20001 mkg20001 left a comment

Choose a reason for hiding this comment

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

missing spidermonkey_78 commits

@doronbehar @worldofpeace
spidermonkey_78: init at 78.1.0
b7c930a 
* format

Co-authored-by: WORLDofPEACE <worldofpeace@protonmail.ch>
(cherry picked from commit 1d45990)
@worldofpeace
Copy link
Contributor Author

missing spidermonkey_78 commits

Pushed that commit

@ofborg ofborg bot requested review from mkg20001 and abbradar October 26, 2020 18:01
mkg20001
mkg20001 approved these changes Oct 26, 2020
View reviewed changes
Copy link
Member

@mkg20001 mkg20001 left a comment

Choose a reason for hiding this comment

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

LGTM

@worldofpeace worldofpeace merged commit f73904b into NixOS:release-20.09 Oct 26, 2020
@worldofpeace worldofpeace deleted the cinnamon-backports branch October 26, 2020 20:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mkg20001 mkg20001 mkg20001 approved these changes

@abbradar abbradar Awaiting requested review from abbradar

Assignees
No one assigned
Labels
6.topic: cinnamon 8.has: package (new) 10.rebuild-darwin: 0 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 @mkg20001 @r-ryantm @doronbehar