JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #186742 from bobby285271/cinnamon

Browse Source 
Cinnamon updates 2022-08-15
This commit is contained in:
Bobby Rong 2022-08-15 21:22:50 +08:00 committed by GitHub
commit 50c0564bc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/x11/desktop-managers/cinnamon.nix
View File

@ -212,6 +212,7 @@ in
# external apps shipped with linux-mint
hexchat
gnome-calculator
gnome-screenshot
] config.environment.cinnamon.excludePackages;
})
];

4
pkgs/applications/misc/sticky/default.nix
View File

@ -11,14 +11,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "sticky";
version = "1.11";
version = "1.12";
format = "other";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
hash = "sha256-PXJpNKzF9goQvfh3lUUfOaZFessFNrWtg8nMDxPxRMo=";
hash = "sha256-kAO8Qz4bTn3+YeIXAvPZ1SpKgn+g+rBgi9+TaqL1vOY=";
};
postPatch = ''

23
pkgs/desktops/cinnamon/cinnamon-common/default.nix
View File

@ -9,7 +9,9 @@
, cjs
, clutter
, fetchFromGitHub
, fetchpatch
, gdk-pixbuf
, gettext
, libgnomekbd
, glib
, gobject-introspection
@ -53,18 +55,31 @@
stdenv.mkDerivation rec {
pname = "cinnamon-common";
version = "5.4.9";
version = "5.4.10";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon";
rev = version;
hash = "sha256-nM87NO/dwOd+hN5/3zX7XUjyKvXh4uDhLcGFcKE9ccA=";
hash = "sha256-yNjFP32+0LXqHfJUxm1A+CTuwny5/IxxT08689f7VlE=";
};
patches = [
./use-sane-install-dir.patch
./libdir.patch
# Re-add libsoup 2.4 as dependency - needed by some applets.
# Can be removed on next update.
(fetchpatch {
url = "https://github.com/linuxmint/cinnamon/commit/76224fe409d074f8a44c70e4fd5e1289f92800b9.patch";
sha256 = "sha256-nDt4kkK1kVstxbij63XxTJ2L/TM9Q1P6feok3xlPQOM=";
})
# keybindings.js: Use bindings.get().
# Can be removed on next update.
# https://github.com/linuxmint/cinnamon/issues/11055
(fetchpatch {
url = "https://github.com/linuxmint/cinnamon/commit/7724e4146baf8431bc1fb55dce60984e77adef5a.patch";
sha256 = "sha256-idGtkBa13nmoEprtmAr6OssO16wJwBd16r2ZbbhrYDQ=";
})
];
buildInputs = [
@ -95,7 +110,7 @@ stdenv.mkDerivation rec {
gsound
gtk3
json-glib
libsoup
libsoup # referenced in js/ui/environment.js
libstartup_notification
libXtst
libXdamage
@ -164,6 +179,8 @@ stdenv.mkDerivation rec {
sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-cinnamon -i ./files/usr/bin/cinnamon-session-cinnamon2d
sed "s|/usr/bin|$out/bin|g" -i ./files/usr/share/xsessions/cinnamon.desktop ./files/usr/share/xsessions/cinnamon2d.desktop
sed "s|msgfmt|${gettext}/bin/msgfmt|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/Spices.py
patchShebangs src/data-to-c.pl
'';

4
pkgs/desktops/cinnamon/nemo/default.nix
View File

@ -23,7 +23,7 @@
stdenv.mkDerivation rec {
pname = "nemo";
version = "5.4.2";
version = "5.4.3";
# TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327)
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-Xn9CgGe7j2APaJRLvx58z2w+sN7ZeDScQz53ZBBnsQs=";
sha256 = "sha256-f3rO0lpOcwpSpIpKrslf6/6nqFbbGTwnKbHpWO+Uf+Q=";
};
outputs = [ "out" "dev" ];

4
pkgs/desktops/cinnamon/xreader/default.nix
View File

@ -26,13 +26,13 @@
stdenv.mkDerivation rec {
pname = "xreader";
version = "3.4.3";
version = "3.4.4";
src = fetchFromGitHub {
owner = "linuxmint";
repo = pname;
rev = version;
sha256 = "sha256-GkJo/wc5StyeQv0pv5XK0Qy3o8EGpfPYY8gOMq0Afgs=";
sha256 = "sha256-uYnQE1GjkUxYlvXSJNmvr6q4OdvAWgv8HqTXk0KkRQM=";
};
nativeBuildInputs = [