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

Cinnamon 6.6 (#464969)

Browse Source
This commit is contained in:
Bobby Rong
2025-12-12 12:57:23 +00:00
committed by GitHub
parent 320d118679 cedf5c5287
commit f5f214e65b
18 changed files with 52 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/x11/desktop-managers/cinnamon.nix
+2
View File
@@ -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
View File
@@ -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
View File
@@ -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
View File
@@ -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
View File
@@ -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 = [
pkgs/by-name/ci/cinnamon-screensaver/package.nix
+2 -4
View File
@@ -21,7 +21,6 @@
python3,
pam,
cairo,
xapp,
xdotool,
xorg,
iso-flags-png-320x240,
@@ -29,13 +28,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-screensaver";
version = "6.4.1";
version = "6.6.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon-screensaver";
tag = version;
hash = "sha256-CK4WP5IafNII81e8HxUNN3Vp36Ln78Xvv5lIMvL+nbk=";
hash = "sha256-Jo9GRsiPvqGZ2ITaewV5H4VMc5EotTTXIaqzXwDA+Z4=";
};
patches = [
@@ -75,7 +74,6 @@ stdenv.mkDerivation rec {
pycairo
]
))
xapp
xdotool
pam
cairo
pkgs/by-name/ci/cinnamon-session/package.nix
+2 -2
View File
@@ -33,13 +33,13 @@ let
in
stdenv.mkDerivation rec {
pname = "cinnamon-session";
version = "6.4.2";
version = "6.6.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon-session";
tag = version;
hash = "sha256-zv1X1MLZBg+Bayd4hjsmrdXkFTRkH4kz7PJe6mFTBqc=";
hash = "sha256-16bBehc8NuPd9vr/J7Y5MoVsqOBQWzh63pzQZ96O0vs=";
};
buildInputs = [
pkgs/by-name/ci/cinnamon-settings-daemon/package.nix
+2 -9
View File
@@ -8,16 +8,13 @@
gtk3,
lcms2,
libcanberra-gtk3,
libgnomekbd,
libnotify,
libxklavier,
wrapGAppsHook3,
pkg-config,
lib,
stdenv,
systemd,
upower,
dconf,
cups,
polkit,
librsvg,
@@ -33,13 +30,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-settings-daemon";
version = "6.4.3";
version = "6.6.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon-settings-daemon";
tag = version;
hash = "sha256-L7+OgymYoYBdprw66RW8tiGA7XGWjTBpDpXhli8Fjoo=";
hash = "sha256-Ho7L4BqLJ0Vz9+ZijZ8ZhQr1NJmGVf8JWtUpplx1JF0=";
};
patches = [
@@ -54,12 +51,9 @@ stdenv.mkDerivation rec {
gsettings-desktop-schemas
lcms2
libcanberra-gtk3
libgnomekbd
libnotify
libxklavier
systemd
upower
dconf
cups
polkit
librsvg
@@ -67,7 +61,6 @@ stdenv.mkDerivation rec {
xorg.libXext
xorg.libX11
xorg.libXi
xorg.libXfixes
fontconfig
nss
libgudev
pkgs/by-name/ci/cinnamon-translations/package.nix
+2 -2
View File
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "cinnamon-translations";
version = "6.4.2";
version = "6.6.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon-translations";
tag = version;
hash = "sha256-By09Y4iHZz3XR7tRd5MyXK5BKOr01yJzTTLQHEZ00q0=";
hash = "sha256-+aqMXice5INNkqLmPc4hawlrc2jRnsGimDPZf28dUSE=";
};
nativeBuildInputs = [
pkgs/by-name/ci/cinnamon/libdir.patch
+1 -1
View File
@@ -17,9 +17,9 @@ index 3c1e9a4f..a77d9b3c 100644
schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
-pkglibdir = join_paths(libdir, meson.project_name().to_lower())
+pkglibdir = libdir
servicedir = join_paths(datadir, 'dbus-1', 'services')
pkgdatadir = join_paths(datadir, meson.project_name().to_lower())
po_dir = join_paths(meson.source_root(), 'po')
--
2.30.0
pkgs/by-name/ci/cinnamon/package.nix
+7 -26
View File
@@ -10,7 +10,6 @@
cjs,
evolution-data-server,
fetchFromGitHub,
fetchpatch,
gcr,
gdk-pixbuf,
gettext,
@@ -19,7 +18,7 @@
gobject-introspection,
gsound,
gtk3,
intltool,
ibus,
json-glib,
libsecret,
libstartup_notification,
@@ -35,7 +34,6 @@
wrapGAppsHook3,
libxml2,
gtk-doc,
caribou,
python3,
keybinder3,
cairo,
@@ -46,6 +44,7 @@
accountsservice,
gnome-online-accounts,
glib-networking,
graphene,
pciutils,
timezonemap,
libnma,
@@ -58,7 +57,6 @@
let
pythonEnv = python3.withPackages (
pp: with pp; [
dbus-python
setproctitle
pygobject3
pycairo
@@ -76,29 +74,18 @@ let
in
stdenv.mkDerivation rec {
pname = "cinnamon";
version = "6.4.13";
version = "6.6.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon";
tag = version;
hash = "sha256-XGG5Qf6Kx1gvZITuuZWn1ggY4FNW/aEuBLbpWyxE2V8=";
hash = "sha256-DiAc1Ng03xzNYYpf79g9p338syPScKftmviNw6Y5i5o=";
};
patches = [
./use-sane-install-dir.patch
./libdir.patch
# js: Use DesktopAppInfo form GioUnix, not Gio
# https://github.com/linuxmint/cinnamon/pull/13091
(fetchpatch {
url = "https://github.com/linuxmint/cinnamon/commit/fa3aef20533af4499fb1161011e62e048bbdc396.patch";
hash = "sha256-qhgBniaUE/8q9BQ+EXcY7BF6eMJg+wC7EYgktwAMbwM=";
})
(fetchpatch {
url = "https://github.com/linuxmint/cinnamon/commit/330b9ff19f33ec1e94e36048ca46011404f796b4.patch";
hash = "sha256-YEQG6C4tx2T3wMfCLZXPFynAzEeIE1eVoadWVENZDFc=";
})
];
buildInputs = [
@@ -113,8 +100,10 @@ stdenv.mkDerivation rec {
gcr
gdk-pixbuf
glib
graphene
gsound
gtk3
ibus
json-glib
libsecret
libstartup_notification
@@ -131,7 +120,6 @@ stdenv.mkDerivation rec {
# bindings
cairo
caribou
keybinder3
upower
xapp
@@ -151,7 +139,6 @@ stdenv.mkDerivation rec {
meson
ninja
wrapGAppsHook3
intltool
gtk-doc
perl
python3.pkgs.libsass # for pysassc
@@ -177,7 +164,6 @@ 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"
substituteInPlace ./modules/cs_user.py --replace-fail "/usr/bin/passwd" "/run/wrappers/bin/passwd"
popd
@@ -189,7 +175,7 @@ stdenv.mkDerivation rec {
substituteInPlace ./files/usr/bin/cinnamon-session-{cinnamon,cinnamon2d} \
--replace-fail "exec cinnamon-session" "exec ${cinnamon-session}/bin/cinnamon-session"
patchShebangs src/data-to-c.pl data/theme/parse-sass.sh
patchShebangs src/data-to-c.pl
'';
postInstall = ''
@@ -198,11 +184,6 @@ stdenv.mkDerivation rec {
'';
preFixup = ''
# https://github.com/NixOS/nixpkgs/issues/101881
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${caribou}/share"
)
buildPythonPath "$out ${python3.pkgs.python-xapp}"
# https://github.com/NixOS/nixpkgs/issues/200397
pkgs/by-name/mu/muffin/package.nix
+2 -11
View File
@@ -2,7 +2,6 @@
stdenv,
lib,
fetchFromGitHub,
fetchpatch,
replaceVars,
cairo,
cinnamon-desktop,
@@ -44,7 +43,7 @@
stdenv.mkDerivation rec {
pname = "muffin";
version = "6.4.1";
version = "6.6.0";
outputs = [
"out"
@@ -56,20 +55,13 @@ stdenv.mkDerivation rec {
owner = "linuxmint";
repo = "muffin";
rev = version;
hash = "sha256-cGC1yGft3uEqefm2DvZrMaROoZKYd6LNY0IJ+58f6vs=";
hash = "sha256-yGbnqIKw+Ouk1onr2H+KckO/YQob1N1beLmfqQhOheU=";
};
patches = [
(replaceVars ./fix-paths.patch {
inherit zenity;
})
# Fix Qt apps crashing on wayland
# https://github.com/linuxmint/muffin/pull/739
(fetchpatch {
url = "https://github.com/linuxmint/muffin/commit/760e2a3046e13610c4fda1291a9a28e589d2bd93.patch";
hash = "sha256-D0u8UxW5USzMW9KlP3Y4XCWxrQ1ySufDv+eCbrAP71c=";
})
];
nativeBuildInputs = [
@@ -119,7 +111,6 @@ stdenv.mkDerivation rec {
mesonFlags = [
# Based on Mint's debian/rules.
"-Degl_device=true"
"-Dwayland_eglstream=true"
"-Dxwayland_path=${lib.getExe xwayland}"
];
pkgs/by-name/ne/nemo-emblems/package.nix
+2 -2
View File
@@ -7,7 +7,7 @@
python3.pkgs.buildPythonApplication rec {
pname = "nemo-emblems";
version = "6.4.0";
version = "6.6.0";
pyproject = true;
# nixpkgs-update: no auto update
@@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec {
owner = "linuxmint";
repo = "nemo-extensions";
rev = version;
hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y=";
hash = "sha256-tXeMkaCYnWzg+6ng8Tyg4Ms1aUeE3xiEkQ3tKEX6Vv8=";
};
sourceRoot = "${src.name}/nemo-emblems";
pkgs/by-name/ne/nemo-fileroller/package.nix
+2 -2
View File
@@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "nemo-fileroller";
version = "6.4.0";
version = "6.6.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "nemo-extensions";
rev = version;
hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y=";
hash = "sha256-tXeMkaCYnWzg+6ng8Tyg4Ms1aUeE3xiEkQ3tKEX6Vv8=";
};
sourceRoot = "${src.name}/nemo-fileroller";
pkgs/by-name/ne/nemo-preview/package.nix
+2 -2
View File
@@ -21,13 +21,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "nemo-preview";
version = "6.4.0";
version = "6.6.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "nemo-extensions";
tag = finalAttrs.version;
hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y=";
hash = "sha256-tXeMkaCYnWzg+6ng8Tyg4Ms1aUeE3xiEkQ3tKEX6Vv8=";
};
sourceRoot = "${finalAttrs.src.name}/nemo-preview";
pkgs/by-name/ne/nemo-python/package.nix
+2 -2
View File
@@ -13,13 +13,13 @@
stdenv.mkDerivation rec {
pname = "nemo-python";
version = "6.4.0";
version = "6.6.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "nemo-extensions";
rev = version;
hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y=";
hash = "sha256-tXeMkaCYnWzg+6ng8Tyg4Ms1aUeE3xiEkQ3tKEX6Vv8=";
};
sourceRoot = "${src.name}/nemo-python";
pkgs/by-name/ne/nemo-seahorse/package.nix
+2 -2
View File
@@ -18,13 +18,13 @@
stdenv.mkDerivation rec {
pname = "nemo-seahorse";
version = "6.4.0";
version = "6.6.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "nemo-extensions";
tag = version;
hash = "sha256-39hWA4SNuEeaPA6D5mWMHjJDs4hYK7/ZdPkTyskvm5Y=";
hash = "sha256-tXeMkaCYnWzg+6ng8Tyg4Ms1aUeE3xiEkQ3tKEX6Vv8=";
};
sourceRoot = "${src.name}/nemo-seahorse";
pkgs/by-name/ne/nemo/package.nix
+10 -4
View File
@@ -13,6 +13,7 @@
gvfs,
cinnamon-desktop,
xapp,
xapp-symbolic-icons,
libexif,
json-glib,
exempi,
@@ -35,13 +36,13 @@ let
in
stdenv.mkDerivation rec {
pname = "nemo";
version = "6.4.5";
version = "6.6.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "nemo";
rev = version;
hash = "sha256-9JfCBC5YjfQadF7KzPgZ1yPkiSjmuEO1tfMU2BmJES8=";
hash = "sha256-4YbWkS4J0iDkp+wnwyJg5TD/fhHsbutyh7q+yFLV9Mk=";
};
patches = [
@@ -93,9 +94,14 @@ stdenv.mkDerivation rec {
'';
preFixup = ''
# Used for some non-fd.o icons (e.g. xapp-text-case-symbolic)
gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${xapp}/share"
--prefix XDG_DATA_DIRS : ${
lib.makeSearchPath "share" [
# For non-fd.o icons.
xapp
xapp-symbolic-icons
]
}
)
'';