commit 2c551ea2d35051b0e4f166b8a7fa659b01205c6c · pyrox.dev/nixpkgs

+5 -5

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

···

       66
       66
        
       

     

       67
       67
        
         config = mkMerge [

     

       68
       68
        
           (mkIf cfg.enable {

     

       69
       69
       -
             services.displayManager.sessionPackages = [ pkgs.cinnamon-common ];

     

       69
       69
       +
             services.displayManager.sessionPackages = [ pkgs.cinnamon ];

     

       70
       70
        
       

     

       71
       71
        
             services.xserver.displayManager.lightdm.greeters.slick = {

     

       72
       72
        
               enable = mkDefault true;

     
···

       114
       114
        
             services.accounts-daemon.enable = true;

     

       115
       115
        
             services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));

     

       116
       116
        
             services.dbus.packages = with pkgs; [

     

       117
       117
       -
               cinnamon-common

     

       117
       117
       +
               cinnamon

     

       118
       118
        
               cinnamon-screensaver

     

       119
       119
        
               nemo-with-extensions

     

       120
       120
        
               xapp

     
···

       166
       166
        
                   desktop-file-utils

     

       167
       167
        
       

     

       168
       168
        
                   # common-files

     

       169
       169
       -
                   cinnamon-common

     

       169
       169
       +
                   cinnamon

     

       170
       170
        
                   cinnamon-session

     

       171
       171
        
                   cinnamon-desktop

     

       172
       172
        
                   cinnamon-menus

     
···

       177
       177
        
       

     

       178
       178
        
                   # session requirements

     

       179
       179
        
                   cinnamon-screensaver

     

       180
       180
       -
                   # cinnamon-killer-daemon: provided by cinnamon-common

     

       180
       180
       +
                   # cinnamon-killer-daemon: provided by cinnamon

     

       181
       181
        
                   networkmanagerapplet # session requirement - also nm-applet not needed

     

       182
       182
        
       

     

       183
       183
        
                   # packages

     
···

       225
       225
        
       

     

       226
       226
        
             services.orca.enable = mkDefault (notExcluded pkgs.orca);

     

       227
       227
        
       

     

       228
       228
       -
             xdg.portal.configPackages = mkDefault [ pkgs.cinnamon-common ];

     

       228
       228
       +
             xdg.portal.configPackages = mkDefault [ pkgs.cinnamon ];

     

       229
       229
        
       

     

       230
       230
        
             # Override GSettings schemas

     

       231
       231
        
             environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";

+2 -2

pkgs/by-name/ar/arc-theme/package.nix

···

       10
       10
        
         gnome-themes-extra,

     

       11
       11
        
         gtk-engine-murrine,

     

       12
       12
        
         inkscape,

     

       13
       13
       -
         cinnamon-common,

     

       13
       13
       +
         cinnamon,

     

       14
       14
        
         makeFontsConf,

     

       15
       15
        
         python3,

     

       16
       16
        
       }:

     
···

       55
       55
        
         mesonFlags = [

     

       56
       56
        
           # "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity"

     

       57
       57
        
           # "-Dvariants=light,darker,dark,lighter"

     

       58
       58
       -
           "-Dcinnamon_version=${cinnamon-common.version}"

     

       58
       58
       +
           "-Dcinnamon_version=${cinnamon.version}"

     

       59
       59
        
           "-Dgnome_shell_version=${gnome-shell.version}"

     

       60
       60
        
           # You will need to patch gdm to make use of this.

     

       61
       61
        
           "-Dgnome_shell_gresource=true"

pkgs/by-name/ci/cinnamon-common/libdir.patch pkgs/by-name/ci/cinnamon/libdir.patch

+1 -2

pkgs/by-name/ci/cinnamon-common/package.nix pkgs/by-name/ci/cinnamon/package.nix

···

       73
       73
        
           ]

     

       74
       74
        
         );

     

       75
       75
        
       in

     

       76
       76
       -
       # TODO (after 25.05 branch-off): Rename to pkgs.cinnamon

     

       77
       76
        
       stdenv.mkDerivation rec {

     

       78
       78
       -
         pname = "cinnamon-common";

     

       77
       77
       +
         pname = "cinnamon";

     

       79
       78
        
         version = "6.4.10";

     

       80
       79
        
       

     

       81
       80
        
         src = fetchFromGitHub {

pkgs/by-name/ci/cinnamon-common/use-sane-install-dir.patch pkgs/by-name/ci/cinnamon/use-sane-install-dir.patch

+1 -1

pkgs/by-name/ci/cinnamon-desktop/package.nix

···

       64
       64
        
         postPatch = ''

     

       65
       65
        
           chmod +x install-scripts/meson_install_schemas.py # patchShebangs requires executable file

     

       66
       66
        
           patchShebangs install-scripts/meson_install_schemas.py

     

       67
       67
       -
           sed "s|/usr/share|/run/current-system/sw/share|g" -i ./schemas/* # NOTE: unless this causes a circular dependency, we could link it to cinnamon-common/share/cinnamon

     

       67
       67
       +
           sed "s|/usr/share|/run/current-system/sw/share|g" -i ./schemas/* # NOTE: unless this causes a circular dependency, we could link it to cinnamon/share/cinnamon

     

       68
       68
        
         '';

     

       69
       69
        
       

     

       70
       70
        
         meta = with lib; {

+2 -2

pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix

···

       15
       15
        
         cinnamon-desktop,

     

       16
       16
        
         cinnamon-session,

     

       17
       17
        
         cinnamon-settings-daemon,

     

       18
       18
       -
         cinnamon-common,

     

       18
       18
       +
         cinnamon,

     

       19
       19
        
         bulky,

     

       20
       20
        
       }:

     

       21
       21
        
       

     
···

       35
       35
        
           cinnamon-desktop

     

       36
       36
        
           cinnamon-session

     

       37
       37
        
           cinnamon-settings-daemon

     

       38
       38
       -
           cinnamon-common

     

       38
       38
       +
           cinnamon

     

       39
       39
        
           gnome-terminal

     

       40
       40
        
           gsettings-desktop-schemas

     

       41
       41
        
           gtk3

+2 -2

pkgs/by-name/ci/cinnamon-screensaver/package.nix

···

       9
       9
        
         dbus,

     

       10
       10
        
         gettext,

     

       11
       11
        
         cinnamon-desktop,

     

       12
       12
       -
         cinnamon-common,

     

       12
       12
       +
         cinnamon,

     

       13
       13
        
         intltool,

     

       14
       14
        
         libxslt,

     

       15
       15
        
         gtk3,

     
···

       80
       80
        
           pam

     

       81
       81
        
           cairo

     

       82
       82
        
           cinnamon-desktop

     

       83
       83
       -
           cinnamon-common

     

       83
       83
       +
           cinnamon

     

       84
       84
        
           libgnomekbd

     

       85
       85
        
           caribou

     

       86
       86
        
         ];

+1 -1

pkgs/top-level/aliases.nix

···

       443
       443
        
         CHOWTapeModel = chow-tape-model; # Added 2024-06-12

     

       444
       444
        
         chromatic = throw "chromatic has been removed due to being unmaintained and failing to build"; # Added 2025-04-18

     

       445
       445
        
         chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27

     

       446
       446
       -
         cinnamon = throw "The cinnamon scope has been removed and all packages have been moved to the top-level"; # Added 2024-11-25

     

       446
       446
       +
         cinnamon-common = cinnamon; # Added 2025-08-06

     

       447
       447
        
         citra = throw "citra has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04

     

       448
       448
        
         citra-nightly = throw "citra-nightly has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04

     

       449
       449
        
         citra-canary = throw "citra-canary has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04