From 2c551ea2d35051b0e4f166b8a7fa659b01205c6c Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 6 Aug 2025 23:51:16 +0800 Subject: [PATCH] cinnamon: Renamed from cinnamon-common This is the upstream project name. --- .../modules/services/x11/desktop-managers/cinnamon.nix | 10 +++++----- pkgs/by-name/ar/arc-theme/package.nix | 4 ++-- pkgs/by-name/ci/cinnamon-desktop/package.nix | 2 +- .../ci/cinnamon-gsettings-overrides/package.nix | 4 ++-- pkgs/by-name/ci/cinnamon-screensaver/package.nix | 4 ++-- .../ci/{cinnamon-common => cinnamon}/libdir.patch | 0 .../ci/{cinnamon-common => cinnamon}/package.nix | 3 +-- .../use-sane-install-dir.patch | 0 pkgs/top-level/aliases.nix | 2 +- 9 files changed, 14 insertions(+), 15 deletions(-) rename pkgs/by-name/ci/{cinnamon-common => cinnamon}/libdir.patch (100%) rename pkgs/by-name/ci/{cinnamon-common => cinnamon}/package.nix (98%) rename pkgs/by-name/ci/{cinnamon-common => cinnamon}/use-sane-install-dir.patch (100%) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index ef8e2000e21c..ddb9b00c3e49 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -66,7 +66,7 @@ in config = mkMerge [ (mkIf cfg.enable { - services.displayManager.sessionPackages = [ pkgs.cinnamon-common ]; + services.displayManager.sessionPackages = [ pkgs.cinnamon ]; services.xserver.displayManager.lightdm.greeters.slick = { enable = mkDefault true; @@ -114,7 +114,7 @@ in services.accounts-daemon.enable = true; services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); services.dbus.packages = with pkgs; [ - cinnamon-common + cinnamon cinnamon-screensaver nemo-with-extensions xapp @@ -166,7 +166,7 @@ in desktop-file-utils # common-files - cinnamon-common + cinnamon cinnamon-session cinnamon-desktop cinnamon-menus @@ -177,7 +177,7 @@ in # session requirements cinnamon-screensaver - # cinnamon-killer-daemon: provided by cinnamon-common + # cinnamon-killer-daemon: provided by cinnamon networkmanagerapplet # session requirement - also nm-applet not needed # packages @@ -225,7 +225,7 @@ in services.orca.enable = mkDefault (notExcluded pkgs.orca); - xdg.portal.configPackages = mkDefault [ pkgs.cinnamon-common ]; + xdg.portal.configPackages = mkDefault [ pkgs.cinnamon ]; # Override GSettings schemas environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; diff --git a/pkgs/by-name/ar/arc-theme/package.nix b/pkgs/by-name/ar/arc-theme/package.nix index 8f6e90986c6f..d92f85e0c870 100644 --- a/pkgs/by-name/ar/arc-theme/package.nix +++ b/pkgs/by-name/ar/arc-theme/package.nix @@ -10,7 +10,7 @@ gnome-themes-extra, gtk-engine-murrine, inkscape, - cinnamon-common, + cinnamon, makeFontsConf, python3, }: @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { mesonFlags = [ # "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity" # "-Dvariants=light,darker,dark,lighter" - "-Dcinnamon_version=${cinnamon-common.version}" + "-Dcinnamon_version=${cinnamon.version}" "-Dgnome_shell_version=${gnome-shell.version}" # You will need to patch gdm to make use of this. "-Dgnome_shell_gresource=true" diff --git a/pkgs/by-name/ci/cinnamon-desktop/package.nix b/pkgs/by-name/ci/cinnamon-desktop/package.nix index a58b09a422d3..ece170d57a4c 100644 --- a/pkgs/by-name/ci/cinnamon-desktop/package.nix +++ b/pkgs/by-name/ci/cinnamon-desktop/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { postPatch = '' chmod +x install-scripts/meson_install_schemas.py # patchShebangs requires executable file patchShebangs install-scripts/meson_install_schemas.py - 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 + 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 ''; meta = with lib; { diff --git a/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix b/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix index e2984b5e00a3..ecbe130d8f5f 100644 --- a/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix +++ b/pkgs/by-name/ci/cinnamon-gsettings-overrides/package.nix @@ -15,7 +15,7 @@ cinnamon-desktop, cinnamon-session, cinnamon-settings-daemon, - cinnamon-common, + cinnamon, bulky, }: @@ -35,7 +35,7 @@ let cinnamon-desktop cinnamon-session cinnamon-settings-daemon - cinnamon-common + cinnamon gnome-terminal gsettings-desktop-schemas gtk3 diff --git a/pkgs/by-name/ci/cinnamon-screensaver/package.nix b/pkgs/by-name/ci/cinnamon-screensaver/package.nix index 77e434714b65..14fc59669d4a 100644 --- a/pkgs/by-name/ci/cinnamon-screensaver/package.nix +++ b/pkgs/by-name/ci/cinnamon-screensaver/package.nix @@ -9,7 +9,7 @@ dbus, gettext, cinnamon-desktop, - cinnamon-common, + cinnamon, intltool, libxslt, gtk3, @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { pam cairo cinnamon-desktop - cinnamon-common + cinnamon libgnomekbd caribou ]; diff --git a/pkgs/by-name/ci/cinnamon-common/libdir.patch b/pkgs/by-name/ci/cinnamon/libdir.patch similarity index 100% rename from pkgs/by-name/ci/cinnamon-common/libdir.patch rename to pkgs/by-name/ci/cinnamon/libdir.patch diff --git a/pkgs/by-name/ci/cinnamon-common/package.nix b/pkgs/by-name/ci/cinnamon/package.nix similarity index 98% rename from pkgs/by-name/ci/cinnamon-common/package.nix rename to pkgs/by-name/ci/cinnamon/package.nix index 3a9f33995283..5d47b88cc244 100644 --- a/pkgs/by-name/ci/cinnamon-common/package.nix +++ b/pkgs/by-name/ci/cinnamon/package.nix @@ -73,9 +73,8 @@ let ] ); in -# TODO (after 25.05 branch-off): Rename to pkgs.cinnamon stdenv.mkDerivation rec { - pname = "cinnamon-common"; + pname = "cinnamon"; version = "6.4.10"; src = fetchFromGitHub { diff --git a/pkgs/by-name/ci/cinnamon-common/use-sane-install-dir.patch b/pkgs/by-name/ci/cinnamon/use-sane-install-dir.patch similarity index 100% rename from pkgs/by-name/ci/cinnamon-common/use-sane-install-dir.patch rename to pkgs/by-name/ci/cinnamon/use-sane-install-dir.patch diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9d4edfce56d6..8590df37049c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -443,7 +443,7 @@ mapAliases { CHOWTapeModel = chow-tape-model; # Added 2024-06-12 chromatic = throw "chromatic has been removed due to being unmaintained and failing to build"; # Added 2025-04-18 chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27 - cinnamon = throw "The cinnamon scope has been removed and all packages have been moved to the top-level"; # Added 2024-11-25 + cinnamon-common = cinnamon; # Added 2025-08-06 citra = throw "citra has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 citra-nightly = throw "citra-nightly has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04 citra-canary = throw "citra-canary has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04