Merge pull request #327144 from bobby285271/upd/cinnamon-xapps-by-name

Move various packages out of cinnamon scope

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

@@ -66,17 +66,17 @@ in
         enable = mkDefault true;
 
         # Taken from mint-artwork.gschema.override
-        theme = mkIf (notExcluded pkgs.cinnamon.mint-themes) {
+        theme = mkIf (notExcluded pkgs.mint-themes) {
           name = mkDefault "Mint-Y-Aqua";
-          package = mkDefault pkgs.cinnamon.mint-themes;
+          package = mkDefault pkgs.mint-themes;
         };
-        iconTheme = mkIf (notExcluded pkgs.cinnamon.mint-y-icons) {
+        iconTheme = mkIf (notExcluded pkgs.mint-y-icons) {
           name = mkDefault "Mint-Y-Sand";
-          package = mkDefault pkgs.cinnamon.mint-y-icons;
+          package = mkDefault pkgs.mint-y-icons;
         };
-        cursorTheme = mkIf (notExcluded pkgs.cinnamon.mint-cursor-themes) {
+        cursorTheme = mkIf (notExcluded pkgs.mint-cursor-themes) {
           name = mkDefault "Bibata-Modern-Classic";
-          package = mkDefault pkgs.cinnamon.mint-cursor-themes;
+          package = mkDefault pkgs.mint-cursor-themes;
         };
       };
 
@@ -101,10 +101,10 @@ in
       security.polkit.enable = true;
       services.accounts-daemon.enable = true;
       services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));
-      services.dbus.packages = with pkgs.cinnamon; [
-        cinnamon-common
-        cinnamon-screensaver
-        nemo-with-extensions
+      services.dbus.packages = with pkgs; [
+        cinnamon.cinnamon-common
+        cinnamon.cinnamon-screensaver
+        cinnamon.nemo-with-extensions
         xapp
       ];
       services.cinnamon.apps.enable = mkDefault true;
@@ -134,21 +134,21 @@ in
         cinnamon-screensaver = {};
       };
 
-      environment.systemPackages = with pkgs.cinnamon // pkgs; ([
+      environment.systemPackages = with pkgs; ([
         desktop-file-utils
 
         # common-files
-        cinnamon-common
-        cinnamon-session
-        cinnamon-desktop
-        cinnamon-menus
-        cinnamon-translations
+        cinnamon.cinnamon-common
+        cinnamon.cinnamon-session
+        cinnamon.cinnamon-desktop
+        cinnamon.cinnamon-menus
+        cinnamon.cinnamon-translations
 
         # utils needed by some scripts
         killall
 
         # session requirements
-        cinnamon-screensaver
+        cinnamon.cinnamon-screensaver
         # cinnamon-killer-daemon: provided by cinnamon-common
         networkmanagerapplet # session requirement - also nm-applet not needed
 
@@ -156,10 +156,10 @@ in
         polkit_gnome
 
         # packages
-        nemo-with-extensions
+        cinnamon.nemo-with-extensions
         gnome-online-accounts-gtk
-        cinnamon-control-center
-        cinnamon-settings-daemon
+        cinnamon.cinnamon-control-center
+        cinnamon.cinnamon-settings-daemon
         libgnomekbd
 
         # theme
@@ -233,7 +233,7 @@ in
       programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome-terminal);
       programs.file-roller.enable = mkDefault (notExcluded pkgs.file-roller);
 
-      environment.systemPackages = with pkgs // pkgs.cinnamon; utils.removePackagesByName [
+      environment.systemPackages = with pkgs; utils.removePackagesByName [
         # cinnamon team apps
         bulky
         warpinator

pkgs/applications/display-managers/lightdm-slick-greeter/default.nix

@@ -7,7 +7,7 @@
 , python3
 , vala
 , wrapGAppsHook3
-, cinnamon
+, xapp
 , lightdm
 , gtk3
 , pixman
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    cinnamon.xapp
+    xapp
     lightdm
     gtk3
     pixman

pkgs/applications/misc/sticky/default.nix

@@ -6,7 +6,7 @@
 , ninja
 , python3
 , wrapGAppsHook3
-, cinnamon
+, xapp
 , glib
 , gspell
 , gtk3
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    cinnamon.xapp
+    xapp
     glib
     gspell
     gtk3
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   pythonPath = with python3.pkgs; [
     pygobject3
-    xapp
+    python-xapp
   ];
 
   dontWrapGApps = true;

pkgs/applications/video/hypnotix/default.nix

@@ -2,7 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , substituteAll
-, cinnamon
+, xapp
 , circle-flags
 , gettext
 , gobject-introspection
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
   dontWrapGApps = true;
 
   buildInputs = [
-    cinnamon.xapp
+    xapp
     python3 # for patchShebangs
   ];
 
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     requests
     setproctitle
     unidecode
-    xapp
+    python-xapp
   ];
 
   installPhase = ''

pkgs/by-name/wa/warpinator/package.nix

@@ -22,7 +22,7 @@ let
     protobuf
     pygobject3
     setproctitle
-    pp.xapp
+    python-xapp
     zeroconf
     grpcio
     setuptools

pkgs/by-name/xp/xplayer/package.nix

@@ -8,10 +8,7 @@
 , gettext
 , glib
 , gobject-introspection
-, gst-plugins-bad
-, gst-plugins-base
-, gst-plugins-good
-, gstreamer
+, gst_all_1
 , gtk-doc
 , gtk3
 , intltool
@@ -40,7 +37,7 @@ stdenv.mkDerivation rec {
   # the gstreamer toolsdir points to the wrong derivation output
   postPatch = ''
     substituteInPlace configure.ac \
-                      --replace '$gst10_toolsdir/gst-inspect-1.0' '${gstreamer}/bin/gst-inspect-1.0' \
+                      --replace '$gst10_toolsdir/gst-inspect-1.0' '${gst_all_1.gstreamer}/bin/gst-inspect-1.0' \
   '';
 
   preBuild = ''
@@ -68,10 +65,10 @@ stdenv.mkDerivation rec {
     clutter-gst
     clutter-gtk
     glib
-    gst-plugins-bad
-    gst-plugins-base
-    gst-plugins-good
-    gstreamer
+    gst_all_1.gst-plugins-bad
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gstreamer
     gtk3
     libpeas
     libxml2

pkgs/by-name/xv/xviewer/package.nix

@@ -1,7 +1,6 @@
 { stdenv
 , lib
 , fetchFromGitHub
-, cinnamon-desktop
 , docbook_xsl
 , exempi
 , gdk-pixbuf
@@ -21,8 +20,9 @@
 , pkg-config
 , python3
 , wrapGAppsHook3
-, xapp
+, cinnamon
 , yelp-tools
+, xapp
 }:
 
 stdenv.mkDerivation rec {
@@ -37,9 +37,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    cinnamon-desktop
     docbook_xsl
-    gdk-pixbuf
     gobject-introspection
     gtk-doc
     itstool
@@ -52,7 +50,9 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    cinnamon.cinnamon-desktop
     exempi
+    gdk-pixbuf
     glib
     gtk3
     lcms2

pkgs/desktops/cinnamon/cinnamon-common/default.nix

@@ -58,7 +58,7 @@ let
     setproctitle
     pygobject3
     pycairo
-    pp.xapp # don't omit `pp.`, see #213561
+    python-xapp
     pillow
     pyinotify # for looking-glass
     pytz
@@ -179,7 +179,7 @@ stdenv.mkDerivation rec {
       --prefix XDG_DATA_DIRS : "${gnome.caribou}/share"
     )
 
-    buildPythonPath "$out ${python3.pkgs.xapp}"
+    buildPythonPath "$out ${python3.pkgs.python-xapp}"
 
     # https://github.com/NixOS/nixpkgs/issues/200397
     patchPythonScript $out/bin/cinnamon-spice-updater

pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix

@@ -23,7 +23,7 @@
 , xapp
 , xdotool
 , xorg
-, iso-flags-png-320x420
+, iso-flags-png-320x240
 }:
 
 stdenv.mkDerivation rec {
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     (python3.withPackages (pp: with pp; [
       pygobject3
       setproctitle
-      python3.pkgs.xapp # The scope prefix is required
+      python-xapp
       pycairo
     ]))
     xapp
@@ -74,9 +74,6 @@ stdenv.mkDerivation rec {
     cinnamon-common
     libgnomekbd
     gnome.caribou
-
-    # things
-    iso-flags-png-320x420
   ];
 
   postPatch = ''
@@ -85,7 +82,7 @@ stdenv.mkDerivation rec {
       -e s,/usr/share/locale,/run/current-system/sw/share/locale,g \
       -e s,/usr/lib/cinnamon-screensaver,$out/lib,g \
       -e s,/usr/share/cinnamon-screensaver,$out/share,g \
-      -e s,/usr/share/iso-flag-png,${iso-flags-png-320x420}/share/iso-flags-png,g \
+      -e s,/usr/share/iso-flag-png,${iso-flags-png-320x240}/share/iso-flags-png,g \
       {} +
   '';
 

pkgs/desktops/cinnamon/cinnamon-session/default.nix

@@ -25,7 +25,7 @@
 
 let
   pythonEnv = python3.withPackages (pp: with pp; [
-    pp.xapp # don't omit `pp.`, see #213561
+    python-xapp
     pygobject3
     setproctitle
   ]);

pkgs/desktops/cinnamon/default.nix

@@ -1,29 +1,6 @@
 { config, pkgs, lib }:
 
 lib.makeScope pkgs.newScope (self: with self; {
-  iso-flags-png-320x420 = pkgs.iso-flags.overrideAttrs (p: p // {
-    buildPhase = "make png-country-320x240-fancy";
-    # installPhase = "mkdir -p $out/share && mv build/png-country-4x2-fancy/res-320x240 $out/share/iso-flags-png-320x420";
-    installPhase = "mkdir -p $out/share && mv build/png-country-4x2-fancy/res-320x240 $out/share/iso-flags-png";
-  });
-
-  iso-flags-svg = pkgs.iso-flags.overrideAttrs (p: p // {
-    buildPhase = "mkdir -p $out/share";
-    installPhase = "mv svg $out/share/iso-flags-svg";
-  });
-
-  # Extensions added here will be shipped by default
-  # We keep this in sync with a default Mint installation
-  # Right now (only) nemo-share is missing
-  nemoExtensions = [
-    folder-color-switcher
-    nemo-emblems
-    nemo-fileroller
-    nemo-python
-  ];
-
-  # blueberry -> pkgs/tools/bluetooth/blueberry/default.nix
-  bulky = callPackage ./bulky { };
   cinnamon-common = callPackage ./cinnamon-common { };
   cinnamon-control-center = callPackage ./cinnamon-control-center { };
   cinnamon-desktop = callPackage ./cinnamon-desktop { };
@@ -34,26 +11,30 @@ lib.makeScope pkgs.newScope (self: with self; {
   cinnamon-session = callPackage ./cinnamon-session { };
   cinnamon-settings-daemon = callPackage ./cinnamon-settings-daemon { };
   cjs = callPackage ./cjs { };
-  folder-color-switcher = callPackage ./folder-color-switcher { };
   nemo = callPackage ./nemo { };
   nemo-emblems = callPackage ./nemo-extensions/nemo-emblems { };
   nemo-fileroller = callPackage ./nemo-extensions/nemo-fileroller { };
   nemo-python = callPackage ./nemo-extensions/nemo-python { };
   nemo-with-extensions = callPackage ./nemo/wrapper.nix { };
-  mint-artwork = callPackage ./mint-artwork { };
-  mint-cursor-themes = callPackage ./mint-cursor-themes { };
-  mint-l-icons = callPackage ./mint-l-icons { };
-  mint-l-theme = callPackage ./mint-l-theme { };
-  mint-themes = callPackage ./mint-themes { };
-  mint-x-icons = callPackage ./mint-x-icons { };
-  mint-y-icons = callPackage ./mint-y-icons { };
   muffin = callPackage ./muffin { };
-  pix = callPackage ./pix { };
-  xapp = callPackage ./xapp { };
-  warpinator = callPackage ./warpinator { };
-  xreader = callPackage ./xreader { };
-  xviewer = callPackage ./xviewer { };
 }) // lib.optionalAttrs config.allowAliases {
   # Aliases need to be outside the scope or they will shadow the attributes from parent scope.
-  xapps = pkgs.cinnamon.xapp; # added 2022-07-27
+  bulky = lib.warn "cinnamon.bulky was moved to top-level. Please use pkgs.bulky directly." pkgs.bulky; # Added on 2024-07-14
+  iso-flags-png-320x420 = lib.warn "cinnamon.iso-flags-png-320x420 was moved to top-level and renamed to pkgs.iso-flags-png-320x240." pkgs.iso-flags-png-320x240; # Added on 2024-07-14
+  iso-flags-svg = throw "cinnamon.iso-flags-svg was removed because this is not used in Cinnamon. You can directly obtain the images from \"\${pkgs.iso-flags.src}/svg\"."; # Added on 2024-07-14
+  folder-color-switcher = lib.warn "cinnamon.folder-color-switcher was moved to top-level. Please use pkgs.folder-color-switcher directly." pkgs.folder-color-switcher; # Added on 2024-07-14
+  mint-artwork = lib.warn "cinnamon.mint-artwork was moved to top-level. Please use pkgs.mint-artwork directly." pkgs.mint-artwork; # Added on 2024-07-14
+  mint-cursor-themes = lib.warn "cinnamon.mint-cursor-themes was moved to top-level. Please use pkgs.mint-cursor-themes directly." pkgs.mint-cursor-themes; # Added on 2024-07-14
+  mint-l-icons = lib.warn "cinnamon.mint-l-icons was moved to top-level. Please use pkgs.mint-l-icons directly." pkgs.mint-l-icons; # Added on 2024-07-14
+  mint-l-theme = lib.warn "cinnamon.mint-l-theme was moved to top-level. Please use pkgs.mint-l-theme directly." pkgs.mint-l-theme; # Added on 2024-07-14
+  mint-themes = lib.warn "cinnamon.mint-themes was moved to top-level. Please use pkgs.mint-themes directly." pkgs.mint-themes; # Added on 2024-07-14
+  mint-x-icons = lib.warn "cinnamon.mint-x-icons was moved to top-level. Please use pkgs.mint-x-icons directly." pkgs.mint-x-icons; # Added on 2024-07-14
+  mint-y-icons = lib.warn "cinnamon.mint-y-icons was moved to top-level. Please use pkgs.mint-y-icons directly." pkgs.mint-y-icons; # Added on 2024-07-14
+  nemoExtensions = throw "cinnamon.nemoExtensions is no longer exposed. To modify list of selected nemo extensions please override cinnamon.nemo-with-extensions."; # Added on 2024-07-14
+  pix = lib.warn "cinnamon.pix was moved to top-level. Please use pkgs.pix directly." pkgs.pix; # Added on 2024-07-14
+  warpinator = lib.warn "cinnamon.warpinator was moved to top-level. Please use pkgs.warpinator directly." pkgs.warpinator; # Added on 2024-07-14
+  xapp = lib.warn "cinnamon.xapp was moved to top-level. Please use pkgs.xapp directly." pkgs.xapp; # Added on 2024-07-14
+  xapps = lib.warn "cinnamon.xapps was moved to top-level and renamed to pkgs.xapp." pkgs.xapp; # Added 2022-07-27
+  xreader = lib.warn "cinnamon.xreader was moved to top-level. Please use pkgs.xreader directly." pkgs.xreader; # Added on 2024-07-14
+  xviewer = lib.warn "cinnamon.xviewer was moved to top-level. Please use pkgs.xviewer directly." pkgs.xviewer; # Added on 2024-07-14
 }

pkgs/desktops/cinnamon/nemo/wrapper.nix

@@ -1,15 +1,25 @@
 { symlinkJoin
 , lib
 , makeWrapper
+, folder-color-switcher
 , nemo
-, nemoExtensions
+, nemo-emblems
+, nemo-fileroller
+, nemo-python
 , python3
 , extensions ? [ ]
 , useDefaultExtensions ? true
 }:
 
 let
-  selectedExtensions = extensions ++ (lib.optionals useDefaultExtensions nemoExtensions);
+  selectedExtensions = extensions ++ lib.optionals useDefaultExtensions [
+    # We keep this in sync with a default Mint installation
+    # Right now (only) nemo-share is missing
+    folder-color-switcher
+    nemo-emblems
+    nemo-fileroller
+    nemo-python
+  ];
   nemoPythonExtensionsDeps = lib.concatMap (x: x.nemoPythonExtensionDeps or []) selectedExtensions;
 in
 symlinkJoin {

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

@@ -15,7 +15,7 @@
 }:
 
 buildPythonPackage rec {
-  pname = "xapp";
+  pname = "python-xapp";
   version = "2.4.2";
 
   format = "other";

pkgs/tools/bluetooth/blueberry/default.nix

@@ -2,7 +2,6 @@
 , lib
 , fetchFromGitHub
 , bluez-tools
-, cinnamon
 , gnome
 , gobject-introspection
 , libnotify
@@ -10,6 +9,7 @@
 , python3Packages
 , util-linux
 , wrapGAppsHook3
+, xapp
 }:
 
 stdenv.mkDerivation rec {
@@ -31,11 +31,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     bluez-tools
-    cinnamon.xapp
     gnome.gnome-bluetooth_1_0
     libnotify
     python3Packages.python
     util-linux
+    xapp
   ];
 
   pythonPath = with python3Packages; [

pkgs/top-level/aliases.nix

@@ -641,6 +641,7 @@ mapAliases ({
   ipfs-migrator-unwrapped = kubo-migrator-unwrapped; # Added 2022-09-27
   ipfs-migrator = kubo-migrator; # Added 2022-09-27
   iproute = iproute2; # moved from top-level 2021-03-14
+  iso-flags-png-320x420 = lib.warn "iso-flags-png-320x420 has been renamed to iso-flags-png-320x240" iso-flags-png-320x240; # Added 2024-07-17
 
   ### J ###
 

pkgs/top-level/all-packages.nix

@@ -21264,6 +21264,15 @@ with pkgs;
 
   iso-flags = callPackage ../data/icons/iso-flags { };
 
+  iso-flags-png-320x240 = iso-flags.overrideAttrs (oldAttrs: {
+    buildFlags = [ "png-country-320x240-fancy" ];
+    installPhase = ''
+      runHook preInstall
+      mkdir -p $out/share && mv build/png-country-4x2-fancy/res-320x240 $out/share/iso-flags-png
+      runHook postInstall
+    '';
+  });
+
   isoimagewriter = libsForQt5.callPackage ../tools/misc/isoimagewriter {};
 
   isort = with python3Packages; toPythonApplication isort;
@@ -34319,11 +34328,16 @@ with pkgs;
 
   timelimit = callPackage ../tools/misc/timelimit { };
 
-  timeshift-unwrapped = callPackage ../applications/backup/timeshift/unwrapped.nix { inherit (cinnamon) xapp; };
-
-  timeshift = callPackage ../applications/backup/timeshift { grubPackage = grub2; };
-
-  timeshift-minimal = callPackage ../applications/backup/timeshift/minimal.nix { };
+  inherit
+    ({
+      timeshift-unwrapped = callPackage ../applications/backup/timeshift/unwrapped.nix { };
+      timeshift = callPackage ../applications/backup/timeshift { grubPackage = grub2; };
+      timeshift-minimal = callPackage ../applications/backup/timeshift/minimal.nix { };
+    })
+    timeshift-unwrapped
+    timeshift
+    timeshift-minimal
+    ;
 
   timewarrior = callPackage ../applications/misc/timewarrior { };
 
@@ -35127,10 +35141,6 @@ with pkgs;
 
   xdotool = callPackage ../tools/X11/xdotool { };
 
-  xed-editor = callPackage ../applications/editors/xed-editor {
-    xapp = cinnamon.xapp;
-  };
-
   xenPackages = recurseIntoAttrs (callPackage ../applications/virtualization/xen/packages.nix {});
 
   xen = xenPackages.xen-vanilla;
@@ -35227,13 +35237,6 @@ with pkgs;
   };
   libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { };
 
-
-  xplayer = callPackage ../applications/video/xplayer {
-    inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad;
-    inherit (cinnamon) xapp;
-  };
-  libxplayer-plparser = callPackage ../applications/video/xplayer/plparser.nix { };
-
   xrectsel = callPackage ../tools/X11/xrectsel { };
 
   xrestop = callPackage ../tools/X11/xrestop { };
@@ -37048,7 +37051,6 @@ with pkgs;
   cdesktopenv = callPackage ../desktops/cdesktopenv { };
 
   cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { });
-  inherit (cinnamon) mint-x-icons mint-y-icons;
 
   deepin = recurseIntoAttrs (callPackage ../desktops/deepin { });
 

pkgs/top-level/python-aliases.nix

@@ -596,6 +596,7 @@ mapAliases ({
   wxPython_4_2 = wxpython; # added 2024-01-07
   WSME = wsme; # added 2023-02-19
   x11_hash = x11-hash; # added 2023-11-05
+  xapp = python-xapp; # added 2024-07-19
   xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31
   XlsxWriter = xlsxwriter; # added 2023-02-19
   Yapsy = yapsy; # added 2023-02-19

pkgs/top-level/python-packages.nix

@@ -10412,6 +10412,11 @@ self: super: with self; {
 
   python-swiftclient = callPackage ../development/python-modules/python-swiftclient { };
 
+  python-xapp = callPackage ../development/python-modules/python-xapp {
+    inherit (pkgs.buildPackages) meson;
+    inherit (pkgs) gtk3 gobject-introspection polkit xapp;
+  };
+
   python-tado = callPackage ../development/python-modules/python-tado { };
 
   python-idzip = callPackage ../development/python-modules/python-idzip { };
@@ -17375,12 +17380,6 @@ self: super: with self; {
     inherit (pkgs) xapian;
   };
 
-  xapp = callPackage ../development/python-modules/xapp {
-    inherit (pkgs.buildPackages) meson;
-    inherit (pkgs) gtk3 gobject-introspection polkit;
-    inherit (pkgs.cinnamon) xapp;
-  };
-
   xarray = callPackage ../development/python-modules/xarray { };
 
   xarray-dataclasses = callPackage ../development/python-modules/xarray-dataclasses { };