feat: add cinnamon #74242

mkg20001 · 2019-11-26T03:10:15Z

Motivation for this change

I need this for myself and I think a lot of people want this, too

NOTE: THIS PR IS WIP
❗ It's been decided that most expressions will be moved out of this PR, and into individual ones.

The packages here are being continued to be developed in https://github.com/mkg20001/nixpkgs and will be moved to PRs to get them ready for upstream

Also, I'm running this on my laptop already. So it works and you can try it already, it's just a bit broken at this point...

Things done

Notify maintainers

cc @

mkg20001 · 2019-11-26T03:16:32Z

I've added the old cinnamon port from the repo before removal & the new cinnamon port https://github.com/cawilliamson/nixos-cinnamon/ from @cawilliamson

Going to merge them together and make a new port, latest going to remove the leftover files

nixos-discourse · 2019-11-26T03:23:13Z

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

https://discourse.nixos.org/t/porting-cinnamon-to-nixos/3512/7

worldofpeace · 2019-11-26T03:46:13Z

I'd be happy to review this/assist 👍

mkg20001 · 2019-11-26T04:38:44Z

I've added services.xserver.desktopManager.cinnamon.enable as an option and referenced cinnamon.nix in desktop-manager/default.nix, yet my local nixbuild fails (evaluation logs show it seems to use my cloned nixpkgs). Any idea?

worldofpeace · 2019-11-26T12:36:44Z

I've added services.xserver.desktopManager.cinnamon.enable as an option and referenced cinnamon.nix in desktop-manager/default.nix, yet my local nixbuild fails (evaluation logs show it seems to use my cloned nixpkgs). Any idea?

I think the module might be a far off idea just yet. I'd probably try to get the packaging very good first and maybe just use some configuration locally to verify their installation. So, I could much better assist with packaging first, as the module might prove more difficult. (but I can for sure help with this as well).

pkgs/desktops/cinnamon/cjs/default.nix

pkgs/desktops/cinnamon-old/cinnamon-control-center.nix

pkgs/top-level/aliases.nix

jtojnar · 2019-11-26T13:44:29Z

pkgs/desktops/nixos-cinnamon/default.nix

+  cinnamon = super.callPackage ./cinnamon { };
+  cinnamon-desktop = super.callPackage ./cinnamon-desktop { };
+  cinnamon-menus = super.callPackage ./cinnamon-menus { };
+  cinnamon-session = super.callPackage ./cinnamon-session { gconf = super.gnome2.GConf; };


Does this still require GConf? It has been deprecated over 8 years ago.

Apparently. I've had to add it again.

pkgs/desktops/cinnamon/xapps/default.nix

mkg20001 · 2019-11-26T13:54:22Z

I think the module might be a far off idea just yet. I'd probably try to get the packaging very good first and maybe just use some configuration locally to verify their installation. So, I could much better assist with packaging first, as the module might prove more difficult. (but I can for sure help with this as well).

Can we keep it now in this PR and I'll move it to another PR later, so we can merge just the packages in this PR?

worldofpeace · 2019-11-26T14:00:30Z

I think the module might be a far off idea just yet. I'd probably try to get the packaging very good first and maybe just use some configuration locally to verify their installation. So, I could much better assist with packaging first, as the module might prove more difficult. (but I can for sure help with this as well).

Can we keep it now in this PR and I'll move it to another PR later, so we can merge just the packages in this PR?

I believe you're suggesting merging packaging first and then a nixos module?
That sounds right, it's an approach we've done for packaging deepin. It would make the reviews smaller and easier to manage.

mkg20001 · 2019-11-27T08:29:27Z

I have trouble adding libnm as a dependency for cinnamon-control-center

I can't find any headers in that package. Are they exposed somewhere else than networkmanager?

This reverts commit 18d7929.

mkg20001 · 2019-12-01T01:18:50Z

That didn't quite work, instead I just copied some code from gnome3 and added it to the module
Now it works

mkg20001 · 2019-12-01T01:25:21Z

In which package is the adwaita theme? Can't find it anywhere, cinnamon depends on it as it's the default theme.

jtojnar · 2019-12-01T01:27:19Z

Adwaita GTK theme is built into GTK.

mkg20001 · 2019-12-01T02:16:55Z

This PR should be ready now.

mkg20001 · 2019-12-01T04:41:27Z

Cinnamon, with fonts, theme & icons fixed

worldofpeace · 2019-12-03T22:52:36Z

Ok, there's still quite a few issues here. Mostly when it comes to the gobject-introspection using packages. I should have some time this week or later to review just those.

While I'm here, why's there a cinnamon-old directory?

worldofpeace · 2019-12-03T22:56:19Z

nixos/modules/services/x11/desktop-managers/cinnamon.nix

+    services.xserver.desktopManager.session = [
+      {
+        name = "cinnamon";
+        bgSupport = true;
+        start = ''
+          ${pkgs.runtimeShell} ${pkgs.cinnamon.cinnamon-common}/bin/cinnamon-session-cinnamon &
+          waitPID=$!
+        '';
+      }
+      {
+        name = "cinnamon2d";
+        bgSupport = true;
+        start = ''
+          ${pkgs.runtimeShell} ${pkgs.cinnamon.cinnamon-common}/bin/cinnamon-session-cinnamon2d &
+          waitPID=$!
+        '';
+      }
+    ];
+  };


I'm assuming that cinnamon has some sort of upstream xsession file?
Then we could use services.xserver.displayManager.extraSessionFilePackages and not create a session manually.

Yes, they just reference a wrong path

Exec=cinnamon-session-cinnamon2d TryExec=/usr/bin/cinnamon2d

jonringer · 2019-12-04T00:59:50Z

do you mind cleaning up the commit history? there should rougly be a commit per package change, so multiple fixes should be squashed

git rebase -i will be your very dear friend

worldofpeace · 2019-12-04T01:28:37Z

do you mind cleaning up the commit history? there should rougly be a commit per package change, so multiple fixes should be squashed

git rebase -i will be your very dear friend

I haven't suggested a particular commit history because it's very wip.
I'm fine with at least the commits coming in a way where it's changes per package so I can review them properly. In the end, cinnamon: init at some_version is fine with me very new package sets.
Though I'm not opposed to it being a commit per package 😄 But at that point I'd reset and recreate the callPackage file from scratch.

jonringer · 2019-12-04T02:02:49Z

actually, I think moving some of these things into other PRs may help on being able to review the changes in a timely manner, some of things that can be refactored to other PRs because they don't rely on other cinnamon packages:

add to maintainers list
xapp
cinnamon-old/cjs
cinnamon/cjs
cinnamon/muffin
cinnamon-control-center
cinnamon-menus
cinnamon-screen-saver'

if i were to do a thorough review of this PR, it would be very difficult to adhere to CONTRIBUTING standards

worldofpeace · 2019-12-04T02:09:12Z

actually, I think moving some of these things into other PRs may help on being able to review the changes in a timely manner, some of things that can be refactored to other PRs because they don't rely on other cinnamon packages:
* add to maintainers list

* xapp

* cinnamon-old/cjs

* cinnamon/cjs

* cinnamon/muffin

* cinnamon-control-center

* cinnamon-menus

* cinnamon-screen-saver'
if i were to do a thorough review of this PR, it would be very difficult to adhere to CONTRIBUTING standards

It seems we established on #74242 (comment).
Though what you've suggested is much better though, it allows reviewers to review less in a sense.
(we've done that for deepin #59023, so things do actually get committed)

mkg20001 · 2019-12-04T02:29:02Z

So we could keep this PR as the "incubator" and then move things to other PRs for finalization, eventually moving everything from this PR into seperate PRs?

mkg20001 · 2019-12-04T02:30:05Z

While I'm here, why's there a cinnamon-old directory?

It's some older port of cinnamon

I'll look through those to find fixes to issues I have, since I've based off another cinnamon port. (nixos-cinnamon, and cinnamon-old is the old cinnamon from nixpkgs)

mkg20001 · 2019-12-07T07:13:35Z

I've created #75138 with just the xapps package. Please review 😄

worldofpeace · 2019-12-07T09:04:20Z

@mkg20001, that sounds cool. As long as review doesn't get duplicated, I'll expect you moving your expressions into nixpkgs piece by piece from here.

Edit: I've updated the description so as to encourage review on the individual PRs.

mkg20001 · 2019-12-13T09:20:47Z

I'm still working on the other cinnamon packages in parallel in https://github.com/mkg20001/nixpkgs (this is where I keep all the stuff that is going to be up streamed eventually)

Edit: The reason because I don't want to push it into this PR, is because it's a gigantic mixture of all the patches and it would be too much effort to split commits, since I'd need to pull them in for testing everytime

I've stumbled upon #9415 because cinnamon fails to load opengl and that seems to be the reason

Also some module fails to find network manager libraries, so some NM stuff is still broken and it can't find adwaita (which package is it in? I've already added gtk3, unsure if I added it to the right package as build input)

Aside from that I've got the desktop working so far without bugs, just the cinnamon spices & nemo extensions are missing

stale · 2020-07-17T02:53:32Z

Hello, I'm a bot and I thank you in the name of the community for your contributions.

Nixpkgs is a busy repository, and unfortunately sometimes PRs get left behind for too long. Nevertheless, we'd like to help committers reach the PRs that are still important. This PR has had no activity for 180 days, and so I marked it as stale, but you can rest assured it will never be closed by a non-human.

If this is still important to you and you'd like to remove the stale label, we ask that you leave a comment. Your comment can be as simple as "still important to me". But there's a bit more you can do:

If you received an approval by an unpriviledged maintainer and you are just waiting for a merge, you can @ mention someone with merge permissions and ask them to help. You might be able to find someone relevant by using Git blame on the relevant files, or via GitHub's web interface. You can see if someone's a member of the nixpkgs-committers team, by hovering with the mouse over their username on the web interface, or by searching them directly on the list.

If your PR wasn't reviewed at all, it might help to find someone who's perhaps a user of the package or module you are changing, or alternatively, ask once more for a review by the maintainer of the package/module this is about. If you don't know any, you can use Git blame on the relevant files, or GitHub's web interface to find someone who touched the relevant files in the past.

If your PR has had reviews and nevertheless got stale, make sure you've responded to all of the reviewer's requests / questions. Usually when PR authors show responsibility and dedication, reviewers (privileged or not) show dedication as well. If you've pushed a change, it's possible the reviewer wasn't notified about your push via email, so you can always officially request them for a review, or just @ mention them and say you've addressed their comments.

Lastly, you can always ask for help at our Discourse Forum, or more specifically, at this thread or at #nixos' IRC channel.

mkg20001 · 2020-09-08T12:40:23Z

merged with #97256

ofborg bot added 6.topic: nixos 8.has: module (update) labels Nov 26, 2019

ofborg bot added the 8.has: documentation label Nov 26, 2019

ofborg bot added 10.rebuild-darwin: 0 10.rebuild-linux: 0 labels Nov 26, 2019

worldofpeace reviewed Nov 26, 2019

View reviewed changes

pkgs/desktops/cinnamon/cjs/default.nix Outdated Show resolved Hide resolved

jtojnar reviewed Nov 26, 2019

View reviewed changes

mkg20001 force-pushed the cinnamon branch 2 times, most recently from c5fb8c2 to 8ea1077 Compare November 27, 2019 11:21

mkg20001 added 13 commits November 28, 2019 18:37

feat: add cinnamon

afbbff5

feat: enable cinnamon

43dbe25

feat: add new and old cinnamon port

b5801d5

feat: cinnamon scope

f7c8459

refactor: move cinnamon new into cinnamon target

2d32d11

feat: add myself as maintainer

c752458

feat: make it build

060ea83

Revert "spidermonkey_52: drop, as is unused"

8dcc791

This reverts commit 18d7929.

feat: hooks and fixes

6c374de

feat: fixesnstuff

e8b03dc

fix: more patches

478656b

fix: hash

0609403

fix: hash for real

db40928

mkg20001 marked this pull request as ready for review December 1, 2019 01:19

mkg20001 requested review from FRidh and jonringer as code owners December 1, 2019 01:19

mkg20001 changed the title ~~[WIP] feat: add cinnamon~~ feat: add cinnamon Dec 1, 2019

fix: theme & icons

f7737be

FRidh added the 2.status: work-in-progress label Dec 1, 2019

worldofpeace reviewed Dec 3, 2019

View reviewed changes

nh2 mentioned this pull request Jan 19, 2020

cinnamon.nemo: init at 4.4.1 #77979

Merged

10 tasks

stale bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 17, 2020

mkg20001 closed this Sep 8, 2020

mkg20001 deleted the cinnamon branch June 28, 2021 04:09

mkg20001 restored the cinnamon branch June 28, 2021 04:09

Janik-Haag added the 12. first-time contribution label Jun 12, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add cinnamon #74242

feat: add cinnamon #74242

mkg20001 commented Nov 26, 2019 •

edited

mkg20001 commented Nov 26, 2019

nixos-discourse commented Nov 26, 2019

worldofpeace commented Nov 26, 2019 •

edited

mkg20001 commented Nov 26, 2019 •

edited

worldofpeace commented Nov 26, 2019

jtojnar Nov 26, 2019

mkg20001 Nov 27, 2019

mkg20001 commented Nov 26, 2019

worldofpeace commented Nov 26, 2019

mkg20001 commented Nov 27, 2019

mkg20001 commented Dec 1, 2019

mkg20001 commented Dec 1, 2019

jtojnar commented Dec 1, 2019

mkg20001 commented Dec 1, 2019

mkg20001 commented Dec 1, 2019

worldofpeace commented Dec 3, 2019

worldofpeace Dec 3, 2019

mkg20001 Dec 7, 2019

jonringer commented Dec 4, 2019

worldofpeace commented Dec 4, 2019 •

edited

jonringer commented Dec 4, 2019

worldofpeace commented Dec 4, 2019

mkg20001 commented Dec 4, 2019

mkg20001 commented Dec 4, 2019

mkg20001 commented Dec 7, 2019

worldofpeace commented Dec 7, 2019 •

edited

mkg20001 commented Dec 13, 2019 •

edited

stale bot commented Jul 17, 2020

mkg20001 commented Sep 8, 2020

feat: add cinnamon #74242

feat: add cinnamon #74242

Conversation

mkg20001 commented Nov 26, 2019 • edited

Motivation for this change

The packages here are being continued to be developed in https://github.com/mkg20001/nixpkgs and will be moved to PRs to get them ready for upstream

Also, I'm running this on my laptop already. So it works and you can try it already, it's just a bit broken at this point...

Things done

Notify maintainers

mkg20001 commented Nov 26, 2019

nixos-discourse commented Nov 26, 2019

worldofpeace commented Nov 26, 2019 • edited

mkg20001 commented Nov 26, 2019 • edited

worldofpeace commented Nov 26, 2019

jtojnar Nov 26, 2019

Choose a reason for hiding this comment

mkg20001 Nov 27, 2019

Choose a reason for hiding this comment

mkg20001 commented Nov 26, 2019

worldofpeace commented Nov 26, 2019

mkg20001 commented Nov 27, 2019

mkg20001 commented Dec 1, 2019

mkg20001 commented Dec 1, 2019

jtojnar commented Dec 1, 2019

mkg20001 commented Dec 1, 2019

mkg20001 commented Dec 1, 2019

worldofpeace commented Dec 3, 2019

worldofpeace Dec 3, 2019

Choose a reason for hiding this comment

mkg20001 Dec 7, 2019

Choose a reason for hiding this comment

jonringer commented Dec 4, 2019

worldofpeace commented Dec 4, 2019 • edited

jonringer commented Dec 4, 2019

worldofpeace commented Dec 4, 2019

mkg20001 commented Dec 4, 2019

mkg20001 commented Dec 4, 2019

mkg20001 commented Dec 7, 2019

worldofpeace commented Dec 7, 2019 • edited

mkg20001 commented Dec 13, 2019 • edited

stale bot commented Jul 17, 2020

mkg20001 commented Sep 8, 2020

mkg20001 commented Nov 26, 2019 •

edited

worldofpeace commented Nov 26, 2019 •

edited

mkg20001 commented Nov 26, 2019 •

edited

worldofpeace commented Dec 4, 2019 •

edited

worldofpeace commented Dec 7, 2019 •

edited

mkg20001 commented Dec 13, 2019 •

edited