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

Merge pull request #332244 from bobby285271/upd/cinnamon 

Cinnamon updates 2024-08-04
parents 5ae3310f b3638691

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

+2 −2
Original line number Diff line number Diff line
@@ -71,13 +71,13 @@ let 
in

stdenv.mkDerivation rec {

  pname = "cinnamon-common";

  version = "6.2.7";

  version = "6.2.8";



  src = fetchFromGitHub {

    owner = "linuxmint";

    repo = "cinnamon";

    rev = version;

    hash = "sha256-j9Jk/mG/EYQUyVCBMJ7B4ZFiSSb3fl+TgQ+wvSSpcwo=";

    hash = "sha256-d1r+ouomcmiqTMHL/iHNL1kUJZvy35e2Qpv5j3bHDAA=";

  };



  patches = [

pkgs/by-name/ne/nemo/package.nix

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


stdenv.mkDerivation rec {

  pname = "nemo";

  version = "6.2.6";

  version = "6.2.7";



  src = fetchFromGitHub {

    owner = "linuxmint";

    repo = pname;

    rev = version;

    sha256 = "sha256-2gUIdAKpdL2obfK5lmlwRgyeeIkiFLO8LBdem1hBzkU=";

    sha256 = "sha256-wYzBrFRCgfmvmjSP6X1cCAFU5aFydO2FNl86j5rAfgA=";

  };



  patches = [

pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix

+4 −6
Original line number Diff line number Diff line
@@ -4,38 +4,36 @@ 
, meson

, ninja

, pkg-config

, wrapGAppsHook3

, wrapGAppsNoGuiHook

, cinnamon-desktop

, glib

, gsettings-desktop-schemas

, gtk3

, mate

, xdg-desktop-portal

}:



stdenv.mkDerivation rec {

  pname = "xdg-desktop-portal-xapp";

  version = "1.0.8";

  version = "1.0.9";



  src = fetchFromGitHub {

    owner = "linuxmint";

    repo = "xdg-desktop-portal-xapp";

    rev = version;

    hash = "sha256-e8yfFL09nztFF6FZpnT0JZyPSQCPQEI76Q29V1b0gs8=";

    hash = "sha256-4U8d9lQxMHQ2XYXnNCQjrNup8z14Q8Ke1Bkf09AVM6k=";

  };



  nativeBuildInputs = [

    meson

    ninja

    pkg-config

    wrapGAppsHook3

    wrapGAppsNoGuiHook

  ];



  buildInputs = [

    cinnamon-desktop # org.cinnamon.desktop.background

    glib

    gsettings-desktop-schemas # org.gnome.system.location

    gtk3

    mate.mate-desktop # org.mate.background

    xdg-desktop-portal

  ];