commit ef4edf25a2cc4ddddb35dc7f5f2691bbb8a8de39 · pyrox.dev/nixpkgs

+5 -5

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

···

       66
        
       

     

       67
        
         config = mkMerge [

     

       68
        
           (mkIf cfg.enable {

     

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

     

       70
        
       

     

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

     

       72
        
               enable = mkDefault true;

     
···

       114
        
             services.accounts-daemon.enable = true;

     

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

     

       116
        
             services.dbus.packages = with pkgs; [

     

       117
       -
               cinnamon-common

     

       118
        
               cinnamon-screensaver

     

       119
        
               nemo-with-extensions

     

       120
        
               xapp

     
···

       166
        
                   desktop-file-utils

     

       167
        
       

     

       168
        
                   # common-files

     

       169
       -
                   cinnamon-common

     

       170
        
                   cinnamon-session

     

       171
        
                   cinnamon-desktop

     

       172
        
                   cinnamon-menus

     
···

       177
        
       

     

       178
        
                   # session requirements

     

       179
        
                   cinnamon-screensaver

     

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

     

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

     

       182
        
       

     

       183
        
                   # packages

     
···

       225
        
       

     

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

     

       227
        
       

     

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

     

       229
        
       

     

       230
        
             # Override GSettings schemas

     

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

···

       66
        
       

     

       67
        
         config = mkMerge [

     

       68
        
           (mkIf cfg.enable {

     

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

     

       70
        
       

     

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

     

       72
        
               enable = mkDefault true;

     
···

       114
        
             services.accounts-daemon.enable = true;

     

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

     

       116
        
             services.dbus.packages = with pkgs; [

     

       117
       +
               cinnamon

     

       118
        
               cinnamon-screensaver

     

       119
        
               nemo-with-extensions

     

       120
        
               xapp

     
···

       166
        
                   desktop-file-utils

     

       167
        
       

     

       168
        
                   # common-files

     

       169
       +
                   cinnamon

     

       170
        
                   cinnamon-session

     

       171
        
                   cinnamon-desktop

     

       172
        
                   cinnamon-menus

     
···

       177
        
       

     

       178
        
                   # session requirements

     

       179
        
                   cinnamon-screensaver

     

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

     

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

     

       182
        
       

     

       183
        
                   # packages

     
···

       225
        
       

     

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

     

       227
        
       

     

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

     

       229
        
       

     

       230
        
             # Override GSettings schemas

     

       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
        
         gnome-themes-extra,

     

       11
        
         gtk-engine-murrine,

     

       12
        
         inkscape,

     

       13
       -
         cinnamon-common,

     

       14
        
         makeFontsConf,

     

       15
        
         python3,

     

       16
        
       }:

     
···

       55
        
         mesonFlags = [

     

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

     

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

     

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

     

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

     

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

     

       61
        
           "-Dgnome_shell_gresource=true"

···

       10
        
         gnome-themes-extra,

     

       11
        
         gtk-engine-murrine,

     

       12
        
         inkscape,

     

       13
       +
         cinnamon,

     

       14
        
         makeFontsConf,

     

       15
        
         python3,

     

       16
        
       }:

     
···

       55
        
         mesonFlags = [

     

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

     

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

     

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

     

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

     

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

     

       61
        
           "-Dgnome_shell_gresource=true"

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

+3 -4

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

···

       73
        
           ]

     

       74
        
         );

     

       75
        
       in

     

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

     

       77
        
       stdenv.mkDerivation rec {

     

       78
       -
         pname = "cinnamon-common";

     

       79
       -
         version = "6.4.7";

     

       80
        
       

     

       81
        
         src = fetchFromGitHub {

     

       82
        
           owner = "linuxmint";

     

       83
        
           repo = "cinnamon";

     

       84
        
           rev = version;

     

       85
       -
           hash = "sha256-WBdzlourYf2oEXUMbzNcNNsc8lBo6ujAy/K1Y6nGOjU=";

     

       86
        
         };

     

       87
        
       

     

       88
        
         patches = [

···

       73
        
           ]

     

       74
        
         );

     

       75
        
       in

     

       0
        
       
     

       76
        
       stdenv.mkDerivation rec {

     

       77
       +
         pname = "cinnamon";

     

       78
       +
         version = "6.4.10";

     

       79
        
       

     

       80
        
         src = fetchFromGitHub {

     

       81
        
           owner = "linuxmint";

     

       82
        
           repo = "cinnamon";

     

       83
        
           rev = version;

     

       84
       +
           hash = "sha256-8yg39x5rWxJ2IcDFO4AjqrctPSjqdUSfmrKbjT3Yx+0=";

     

       85
        
         };

     

       86
        
       

     

       87
        
         patches = [

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
        
         postPatch = ''

     

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

     

       66
        
           patchShebangs install-scripts/meson_install_schemas.py

     

       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

     

       68
        
         '';

     

       69
        
       

     

       70
        
         meta = with lib; {

···

       64
        
         postPatch = ''

     

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

     

       66
        
           patchShebangs install-scripts/meson_install_schemas.py

     

       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
        
         '';

     

       69
        
       

     

       70
        
         meta = with lib; {

+2 -2

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

···

       15
        
         cinnamon-desktop,

     

       16
        
         cinnamon-session,

     

       17
        
         cinnamon-settings-daemon,

     

       18
       -
         cinnamon-common,

     

       19
        
         bulky,

     

       20
        
       }:

     

       21
        
       

     
···

       35
        
           cinnamon-desktop

     

       36
        
           cinnamon-session

     

       37
        
           cinnamon-settings-daemon

     

       38
       -
           cinnamon-common

     

       39
        
           gnome-terminal

     

       40
        
           gsettings-desktop-schemas

     

       41
        
           gtk3

···

       15
        
         cinnamon-desktop,

     

       16
        
         cinnamon-session,

     

       17
        
         cinnamon-settings-daemon,

     

       18
       +
         cinnamon,

     

       19
        
         bulky,

     

       20
        
       }:

     

       21
        
       

     
···

       35
        
           cinnamon-desktop

     

       36
        
           cinnamon-session

     

       37
        
           cinnamon-settings-daemon

     

       38
       +
           cinnamon

     

       39
        
           gnome-terminal

     

       40
        
           gsettings-desktop-schemas

     

       41
        
           gtk3

+4 -4

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

···

       9
        
         dbus,

     

       10
        
         gettext,

     

       11
        
         cinnamon-desktop,

     

       12
       -
         cinnamon-common,

     

       13
        
         intltool,

     

       14
        
         libxslt,

     

       15
        
         gtk3,

     
···

       29
        
       

     

       30
        
       stdenv.mkDerivation rec {

     

       31
        
         pname = "cinnamon-screensaver";

     

       32
       -
         version = "6.4.0";

     

       33
        
       

     

       34
        
         src = fetchFromGitHub {

     

       35
        
           owner = "linuxmint";

     

       36
        
           repo = "cinnamon-screensaver";

     

       37
        
           rev = version;

     

       38
       -
           hash = "sha256-XlEu/aBwNeu+CC6IRnFTF6LUnb7VY2+OOGsdCvQYweA=";

     

       39
        
         };

     

       40
        
       

     

       41
        
         patches = [

     
···

       80
        
           pam

     

       81
        
           cairo

     

       82
        
           cinnamon-desktop

     

       83
       -
           cinnamon-common

     

       84
        
           libgnomekbd

     

       85
        
           caribou

     

       86
        
         ];

···

       9
        
         dbus,

     

       10
        
         gettext,

     

       11
        
         cinnamon-desktop,

     

       12
       +
         cinnamon,

     

       13
        
         intltool,

     

       14
        
         libxslt,

     

       15
        
         gtk3,

     
···

       29
        
       

     

       30
        
       stdenv.mkDerivation rec {

     

       31
        
         pname = "cinnamon-screensaver";

     

       32
       +
         version = "6.4.1";

     

       33
        
       

     

       34
        
         src = fetchFromGitHub {

     

       35
        
           owner = "linuxmint";

     

       36
        
           repo = "cinnamon-screensaver";

     

       37
        
           rev = version;

     

       38
       +
           hash = "sha256-CK4WP5IafNII81e8HxUNN3Vp36Ln78Xvv5lIMvL+nbk=";

     

       39
        
         };

     

       40
        
       

     

       41
        
         patches = [

     
···

       80
        
           pam

     

       81
        
           cairo

     

       82
        
           cinnamon-desktop

     

       83
       +
           cinnamon

     

       84
        
           libgnomekbd

     

       85
        
           caribou

     

       86
        
         ];

+4 -4

pkgs/by-name/cj/cjs/package.nix

···

       8
        
         glib,

     

       9
        
         readline,

     

       10
        
         libsysprof-capture,

     

       11
       -
         spidermonkey_115,

     

       12
        
         meson,

     

       13
        
         mesonEmulatorHook,

     

       14
        
         dbus,

     
···

       19
        
       

     

       20
        
       stdenv.mkDerivation rec {

     

       21
        
         pname = "cjs";

     

       22
       -
         version = "6.4.0";

     

       23
        
       

     

       24
        
         src = fetchFromGitHub {

     

       25
        
           owner = "linuxmint";

     

       26
        
           repo = "cjs";

     

       27
        
           rev = version;

     

       28
       -
           hash = "sha256-2lkIWroOo3hxu9/L/Ty7CADzVrZ0ohyHVmm65NoNlD4=";

     

       29
        
         };

     

       30
        
       

     

       31
        
         outputs = [

     
···

       52
        
           cairo

     

       53
        
           readline

     

       54
        
           libsysprof-capture

     

       55
       -
           spidermonkey_115

     

       56
        
         ];

     

       57
        
       

     

       58
        
         propagatedBuildInputs = [

···

       8
        
         glib,

     

       9
        
         readline,

     

       10
        
         libsysprof-capture,

     

       11
       +
         spidermonkey_128,

     

       12
        
         meson,

     

       13
        
         mesonEmulatorHook,

     

       14
        
         dbus,

     
···

       19
        
       

     

       20
        
       stdenv.mkDerivation rec {

     

       21
        
         pname = "cjs";

     

       22
       +
         version = "128.0";

     

       23
        
       

     

       24
        
         src = fetchFromGitHub {

     

       25
        
           owner = "linuxmint";

     

       26
        
           repo = "cjs";

     

       27
        
           rev = version;

     

       28
       +
           hash = "sha256-B9N/oNRvsnr3MLkpcH/aBST6xOJSFdvSUFuD6EldE38=";

     

       29
        
         };

     

       30
        
       

     

       31
        
         outputs = [

     
···

       52
        
           cairo

     

       53
        
           readline

     

       54
        
           libsysprof-capture

     

       55
       +
           spidermonkey_128

     

       56
        
         ];

     

       57
        
       

     

       58
        
         propagatedBuildInputs = [

+1 -1

pkgs/top-level/aliases.nix

···

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

     

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

     

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

     

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

     

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

     

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

     

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

···

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

     

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

     

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

     

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

     

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

     

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

     

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