Unverified Commit 4b2a0b20 authored by Bobby Rong's avatar Bobby Rong Committed by GitHub
Browse files

Merge pull request #319091 from bobby285271/upd/cinnamon 

Cinnamon 6.2
parents 7e00526b 49d0f43f

nixos/doc/manual/release-notes/rl-2411.section.md

+5 −0
Original line number Diff line number Diff line
@@ -156,6 +156,11 @@ 
  The derivation now installs "impl" headers selectively instead of by a wildcard.

  Use `imgui.src` if you just want to access the unpacked sources.



- Cinnamon has been updated to 6.2.

  - Following Mint 22 defaults, the Cinnamon module no longer ships geary and hexchat by default.

  - Nemo is now built with gtk-layer-shell support, note that for now it will be expected to see nemo-desktop

    listed as a regular entry in Cinnamon Wayland session's window list applet.



- Support for *runner registration tokens* has been [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/380872)

  in `gitlab-runner` 15.6 and is expected to be removed in `gitlab-runner` 18.0. Configuration of existing runners

  should be changed to using *runner authentication tokens* by configuring

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

+3 −21
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
, cjs

, evolution-data-server

, fetchFromGitHub

, fetchpatch

, gdk-pixbuf

, gettext

, libgnomekbd
@@ -72,25 +71,18 @@ let 
in

stdenv.mkDerivation rec {

  pname = "cinnamon-common";

  version = "6.0.4";

  version = "6.2.2";



  src = fetchFromGitHub {

    owner = "linuxmint";

    repo = "cinnamon";

    rev = version;

    hash = "sha256-I0GJv2lcl5JlKPIiWoKMXTf4OLkznS5MpiOIvZ76bJQ=";

    hash = "sha256-iivrPSzmvhImfrOD2Ec6BjbtRpHAQs71N/UDSPoZwTE=";

  };



  patches = [

    ./use-sane-install-dir.patch

    ./libdir.patch



    # Switch to GNOME Online Accounts GTK

    (fetchpatch {

      url = "https://github.com/linuxmint/cinnamon/commit/d22f889c376734f0ca5d904885c2772e790fbadc.patch";

      includes = [ "files/usr/share/cinnamon/cinnamon-settings/cinnamon-settings.py" ];

      hash = "sha256-xutJqxtzk3/BUQGZY/tnBkRyAfZZY7AckaGC6b7Sfn8=";

    })

  ];



  buildInputs = [
@@ -166,6 +158,7 @@ stdenv.mkDerivation rec { 
                                                          --replace-fail 'subprocess.run(["/usr/bin/' 'subprocess.run(["' \

                                                          --replace-fail "msgfmt" "${gettext}/bin/msgfmt"

      substituteInPlace ./modules/cs_info.py              --replace-fail "lspci" "${pciutils}/bin/lspci"

      substituteInPlace ./modules/cs_keyboard.py          --replace-fail "/usr/bin/cinnamon-dbus-command" "$out/bin/cinnamon-dbus-command"

      substituteInPlace ./modules/cs_themes.py            --replace-fail "$out/share/cinnamon/styles.d" "/run/current-system/sw/share/cinnamon/styles.d"

    popd
@@ -178,17 +171,6 @@ stdenv.mkDerivation rec { 
  postInstall = ''

    # Use locales from cinnamon-translations.

    ln -s ${cinnamon-translations}/share/locale $out/share/locale



    # Do not install online accounts module, with a -Donlineaccounts=false c-c-c

    # this just shows an empty page.

    rm -f $out/share/cinnamon/cinnamon-settings/modules/cs_online_accounts.py



    # g-o-a-gtk already provides its own desktop item.

    rm -f $out/share/applications/cinnamon-settings-online-accounts.desktop



    # Actually removes Adwaita and HighContrast from Cinnamon styles with mint-artwork 1.8.2.

    # https://github.com/linuxmint/cinnamon/commit/13b1ad104e88197f6c4e2d02ab2674c07254b8e8

    rm -r $out/share/cinnamon/styles.d

  '';



  preFixup = ''

pkgs/desktops/cinnamon/cinnamon-control-center/default.nix

+2 −4
Original line number Diff line number Diff line
@@ -35,13 +35,13 @@ 


stdenv.mkDerivation rec {

  pname = "cinnamon-control-center";

  version = "6.0.1";

  version = "6.2.0";



  src = fetchFromGitHub {

    owner = "linuxmint";

    repo = pname;

    rev = version;

    hash = "sha256-AYnI+k6CzpWUutusCSDR5KhOmv5FWoChotAbCJXTh4I=";

    hash = "sha256-Blod69RzPTE3DztRo0PK0MKCE+vq0HWrcJcC/1e8eRI=";

  };



  buildInputs = [
@@ -83,8 +83,6 @@ stdenv.mkDerivation rec { 
  mesonFlags = [

    # use locales from cinnamon-translations

    "--localedir=${cinnamon-translations}/share/locale"

    # https://github.com/linuxmint/cinnamon-control-center/issues/326

    "-Donlineaccounts=false"

  ];



  nativeBuildInputs = [

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

+2 −2
Original line number Diff line number Diff line
@@ -19,13 +19,13 @@ 


stdenv.mkDerivation rec {

  pname = "cinnamon-desktop";

  version = "6.0.0";

  version = "6.2.0";



  src = fetchFromGitHub {

    owner = "linuxmint";

    repo = pname;

    rev = version;

    hash = "sha256-Ay9JyPBsE345dBwQHChkaGuoXiB2nPyvCNhWWphL8kY=";

    hash = "sha256-9uewZh0GHQAenTcZpLchgFXSt3vOhxLbaepsJIkjTdI=";

  };



  outputs = [ "out" "dev" ];

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

+2 −2
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@ 


stdenv.mkDerivation rec {

  pname = "cinnamon-menus";

  version = "6.0.0";

  version = "6.2.0";



  src = fetchFromGitHub {

    owner = "linuxmint";

    repo = pname;

    rev = version;

    hash = "sha256-zP1jA5Fwxh6QrM5YwJo7SFPWaxkJsv1D84dhIDP5xuI=";

    hash = "sha256-HOipeUV9daPSsJ+SHPlsyEAg2SwKQkZBm1JUoNtDZAY=";

  };



  buildInputs = [