diff options
| author | Bobby Rong <rjl931189261@126.com> | 2023-03-29 21:36:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-29 21:36:10 +0800 |
| commit | 90c9177eb634ec94b2b32de0ca4ad37f72898852 (patch) | |
| tree | 9ae6d68063b6ab7315c8b7fc209b076496d0a48b /pkgs/desktops | |
| parent | e02ad91f56b3766dbe5defe561c2f440d5dc1170 (diff) | |
| parent | 4831d420c2a71b2e28088be404540adf658ba263 (diff) | |
Merge pull request #223679 from bobby285271/upd/cinnamon
Cinnamon updates 2023-03-29
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/cinnamon/nemo/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/desktops/cinnamon/xapp/default.nix | 14 |
2 files changed, 4 insertions, 14 deletions
diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 3e9a3e81eb1f0..f9f08b35d67dd 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "5.6.4"; + version = "5.6.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-zvELN9ggfmfIEPeD0VEWM25kRi8RWA/aKlrdO5dKX1k="; + sha256 = "sha256-HdDe2VE9LQqiwFrUSIctOi/ffNOmLy6SyG30EL8UA5Q="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/xapp/default.nix b/pkgs/desktops/cinnamon/xapp/default.nix index 1c4330221a66f..719a8dd3968a6 100644 --- a/pkgs/desktops/cinnamon/xapp/default.nix +++ b/pkgs/desktops/cinnamon/xapp/default.nix @@ -1,5 +1,4 @@ { fetchFromGitHub -, fetchpatch , glib , gobject-introspection , gtk3 @@ -23,7 +22,7 @@ stdenv.mkDerivation rec { pname = "xapp"; - version = "2.4.2"; + version = "2.4.3"; outputs = [ "out" "dev" ]; @@ -31,18 +30,9 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-etB+q7FIwbApTUk8RohAy3kHX8Vb4cSY/qkvhj94yTM="; + hash = "sha256-j04vy/uVWY08Xdxqfo2MMUAlqsUMJTsAt67+XjkdhFg="; }; - patches = [ - # xapp-sn-watcher crashes on cinnamon with glib 2.76.0 - # https://github.com/linuxmint/xapp/issues/165 - (fetchpatch { - url = "https://github.com/linuxmint/xapp/commit/3ef9861d6228c2061fbde2c0554be5ae6f42befa.patch"; - sha256 = "sha256-7hYXA43UQpBLLjRVPoACc8xdhKyKnt3cDUBL4PhEtJY="; - }) - ]; - nativeBuildInputs = [ meson ninja |