diff --git a/nixos/tests/cinnamon-wayland.nix b/nixos/tests/cinnamon-wayland.nix index e4118d82f4dd..632ab53cc529 100644 --- a/nixos/tests/cinnamon-wayland.nix +++ b/nixos/tests/cinnamon-wayland.nix @@ -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" diff --git a/nixos/tests/cinnamon.nix b/nixos/tests/cinnamon.nix index 4874673ebbec..d8b52c261a42 100644 --- a/nixos/tests/cinnamon.nix +++ b/nixos/tests/cinnamon.nix @@ -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" diff --git a/pkgs/by-name/ci/cinnamon/package.nix b/pkgs/by-name/ci/cinnamon/package.nix index d03a0b32abc5..3d80235e643a 100644 --- a/pkgs/by-name/ci/cinnamon/package.nix +++ b/pkgs/by-name/ci/cinnamon/package.nix @@ -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 = [ diff --git a/pkgs/by-name/cj/cjs/package.nix b/pkgs/by-name/cj/cjs/package.nix index 42a63daa43ac..87a0234c0daf 100644 --- a/pkgs/by-name/cj/cjs/package.nix +++ b/pkgs/by-name/cj/cjs/package.nix @@ -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" ];