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

cinnamon: 6.6.7 -> 6.6.8, cjs: 128.1 -> 140.0 (#510293)

Browse Source
This commit is contained in:
Bobby Rong
2026-04-18 12:38:59 +00:00
committed by GitHub
parent 30a512f6f6 4dec8da385
commit 6acac3a822
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/tests/cinnamon-wayland.nix
+1 -1
View File
@@ -57,7 +57,7 @@
machine.wait_until_succeeds("journalctl -b --grep 'calendar@cinnamon.org: Calendar events supported'")
with subtest("Check if sessionPath option actually works"):
machine.succeed("${eval "imports.gi.GIRepository.Repository.get_search_path\\(\\)"} | grep gpaste")
machine.succeed("${eval "imports.gi.GIRepository.Repository.dup_default\\(\\).get_search_path\\(\\)"} | grep gpaste")
with subtest("Check if various environment variables are set"):
cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/nemo-desktop)/environ"
nixos/tests/cinnamon.nix
+1 -1
View File
@@ -68,7 +68,7 @@
machine.wait_until_succeeds("journalctl -b --grep 'calendar@cinnamon.org: Calendar events supported'")
with subtest("Check if sessionPath option actually works"):
machine.succeed("${eval "imports.gi.GIRepository.Repository.get_search_path\\(\\)"} | grep gpaste")
machine.succeed("${eval "imports.gi.GIRepository.Repository.dup_default\\(\\).get_search_path\\(\\)"} | grep gpaste")
with subtest("Check if various environment variables are set"):
cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/nemo-desktop)/environ"
pkgs/by-name/ci/cinnamon/package.nix
+2 -2
View File
@@ -74,13 +74,13 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "cinnamon";
version = "6.6.7";
version = "6.6.8";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cinnamon";
tag = finalAttrs.version;
hash = "sha256-UP/8FIgTCdQrE+kvG0nLo+oqYo8x/lm3RPKOXnTFJaE=";
hash = "sha256-ByPn2VV40y+3/FW/KPIsLt43FhVxQAQldCK26KNKdjw=";
};
patches = [
pkgs/by-name/cj/cjs/package.nix
+9 -5
View File
@@ -8,7 +8,7 @@
glib,
readline,
libsysprof-capture,
spidermonkey_128,
spidermonkey_140,
meson,
mesonEmulatorHook,
dbus,
@@ -19,13 +19,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "cjs";
version = "128.1";
version = "140.0";
src = fetchFromGitHub {
owner = "linuxmint";
repo = "cjs";
tag = finalAttrs.version;
hash = "sha256-YJwzFKEOnwBTJUPagXk1PCYmQqVqr7Zu7aVaJCPgirU=";
hash = "sha256-zbYcKzTuDLnFEVeSXgoZDUK8Wx3gysGSqZyXjKrBStI=";
};
outputs = [
@@ -52,14 +52,18 @@ stdenv.mkDerivation (finalAttrs: {
cairo
readline
libsysprof-capture
spidermonkey_128
spidermonkey_140
];
propagatedBuildInputs = [
glib
];
mesonFlags = lib.optionals stdenv.hostPlatform.isMusl [
mesonFlags = [
# This is just a copy of gjs so we don't run tests here.
"-Dskip_gtk_tests=true"
]
++ lib.optionals stdenv.hostPlatform.isMusl [
"-Dprofiler=disabled"
];