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

Cinnamon 6.6 (#464969)

parents 320d1186 cedf5c52

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

+2 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ in 


      # Default services

      services.blueman.enable = mkDefault (notExcluded pkgs.blueman);

      services.hardware.bolt.enable = mkDefault (notExcluded pkgs.bolt);

      hardware.bluetooth.enable = mkDefault true;

      security.polkit.enable = true;

      services.accounts-daemon.enable = true;
@@ -173,6 +174,7 @@ in 
            cinnamon-translations



            # utils needed by some scripts

            inxi

            killall



            # session requirements

nixos/tests/cinnamon.nix

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 


      with subtest("Open virtual keyboard"):

          machine.succeed("${su "dbus-send --print-reply --dest=org.Cinnamon /org/Cinnamon org.Cinnamon.ToggleKeyboard"}")

          machine.wait_for_text('(Ctrl|Alt)')

          machine.wait_for_text('(Esc|123)')

          machine.sleep(2)

          machine.screenshot("cinnamon_virtual_keyboard")

pkgs/by-name/ci/cinnamon-control-center/package.nix

+7 −14
Original line number Diff line number Diff line
@@ -12,19 +12,15 @@ 
  libxml2,

  colord,

  polkit,

  libxkbfile,

  cinnamon-menus,

  libgnomekbd,

  libxklavier,

  networkmanager,

  libgudev,

  libwacom,

  wrapGAppsHook3,

  glibc,

  libnma,

  libXi,

  modemmanager,

  xorg,

  gdk-pixbuf,

  xorgproto,

  meson,

  ninja,

  cinnamon-translations,
@@ -34,13 +30,13 @@ 


stdenv.mkDerivation rec {

  pname = "cinnamon-control-center";

  version = "6.4.2";

  version = "6.6.0";



  src = fetchFromGitHub {

    owner = "linuxmint";

    repo = "cinnamon-control-center";

    tag = version;

    hash = "sha256-nw70sbiz3+dp40WP957hOVo/mQOg2MJknZNN5Kw/Q/0=";

    hash = "sha256-TjTwtTFbiC4A4qe9TIyZJtGrSymujhEgM8SpZQ92RZA=";

  };



  buildInputs = [
@@ -50,19 +46,15 @@ stdenv.mkDerivation rec { 
    cinnamon-desktop

    libnotify

    cinnamon-menus

    libxml2

    polkit

    libgnomekbd

    libxklavier

    colord

    libgudev

    libwacom

    networkmanager

    libnma

    libXi

    modemmanager

    xorg.libXxf86misc

    xorg.libxkbfile

    gdk-pixbuf

    xorgproto

    upower

  ];
@@ -76,6 +68,7 @@ stdenv.mkDerivation rec { 
  ];



  nativeBuildInputs = [

    libxml2 # xmllint

    pkg-config

    meson

    ninja

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

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


stdenv.mkDerivation rec {

  pname = "cinnamon-desktop";

  version = "6.4.2";

  version = "6.6.0";



  src = fetchFromGitHub {

    owner = "linuxmint";

    repo = "cinnamon-desktop";

    tag = version;

    hash = "sha256-kNxVdPtCQtz4TSyCc6uKHmAGWm2nlWnLwC3Cm0E42Jc=";

    hash = "sha256-9qgt+E5qbzq+x9fJKkoSBFgA96HBDLysQvg6b04WbMU=";

  };



  outputs = [

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

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


stdenv.mkDerivation rec {

  pname = "cinnamon-menus";

  version = "6.4.0";

  version = "6.6.0";



  src = fetchFromGitHub {

    owner = "linuxmint";

    repo = "cinnamon-menus";

    tag = version;

    hash = "sha256-ug1RSP2TBrypi0aGhF05k39koY3rGgJi0LuWyuuICd0=";

    hash = "sha256-vjgWPFNmRkJWynimvBuxCxLK5C7tQxqJ5Y4dkZXSDSA=";

  };



  buildInputs = [