Merge pull request #235511 from bobby285271/upd/cinnamon-bpo

Cinnamon updates 2023-06-02

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

@@ -70,9 +70,9 @@ in
           name = mkDefault "Mint-Y-Aqua";
           package = mkDefault pkgs.cinnamon.mint-themes;
         };
-        iconTheme = mkIf (notExcluded pkgs.cinnamon.mint-x-icons) {
+        iconTheme = mkIf (notExcluded pkgs.cinnamon.mint-y-icons) {
           name = mkDefault "Mint-Y-Aqua";
-          package = mkDefault pkgs.cinnamon.mint-x-icons;
+          package = mkDefault pkgs.cinnamon.mint-y-icons;
         };
         cursorTheme = mkIf (notExcluded pkgs.cinnamon.mint-cursor-themes) {
           name = mkDefault "Bibata-Modern-Classic";

nixos/tests/cinnamon.nix

@@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
 
   meta.maintainers = lib.teams.cinnamon.members;
 
-  nodes.machine = { nodes, ... }: {
+  nodes.machine = { ... }: {
     imports = [ ./common/user-account.nix ];
     services.xserver.enable = true;
     services.xserver.desktopManager.cinnamon.enable = true;
@@ -13,7 +13,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
 
   testScript = { nodes, ... }:
     let
-      user = nodes.machine.config.users.users.alice;
+      user = nodes.machine.users.users.alice;
       uid = toString user.uid;
       bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus";
       display = "DISPLAY=:0.0";

pkgs/desktops/cinnamon/warpinator/default.nix

@@ -33,13 +33,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "warpinator";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-H8bFSgx3IysHCoKrMZ9gbwRl9forEjY90a/PIC68E6k=";
+    hash = "sha256-crGW1FBfTEiKqx981EzG414we4icyBv/keGtMlr8UFc=";
   };
 
   nativeBuildInputs = [
@@ -77,11 +77,6 @@ stdenv.mkDerivation rec {
       --replace '"/bin/python3"' '"${pythonEnv.interpreter}"' \
       --replace "/bin/bwrap" "${bubblewrap}/bin/bwrap" \
       --replace 'GLib.find_program_in_path("bwrap")' "True"
-
-    # Typo fix that can be removed on next update
-    # https://github.com/linuxmint/warpinator/pull/174
-    substituteInPlace src/remote.py \
-      --replace "receiver.remaining_count" "op.remaining_count"
   '';
 
   passthru.updateScript = gitUpdater {

pkgs/development/python-modules/xapp/default.nix

@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "xapp";
-  version = "2.4.0";
+  version = "2.4.1";
 
   format = "other";
 
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "linuxmint";
     repo = "python-xapp";
     rev = version;
-    hash = "sha256-qEK71cGNGmaThxlFVsfnLUTD83RTr8GP+501c4UbHCk=";
+    hash = "sha256-Kvhp+biZ+KK9FYma/8cUEaQCHPKMLjOO909kbyMLQ3o=";
   };
 
   nativeBuildInputs = [