diff options
author | Bobby Rong <rjl931189261@126.com> | 2023-12-03 12:20:39 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-03 12:20:39 +0800 |
commit | 43744f5bc4849b95ab78f24ca44b4929ae0ecf85 (patch) | |
tree | c240304c533a36a9eb48def3da2c0ab37e74a718 /pkgs/desktops | |
parent | 0aa1cc9fa4c2d70efece2bb5532c358c937de47d (diff) | |
parent | 74065b1858490a3fc0d2b80033d0a74996844c3e (diff) |
Merge pull request #268515 from NixOS/cinnamon
Cinnamon 6.0
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/cinnamon/bulky/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-common/default.nix | 21 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-control-center/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-desktop/default.nix | 6 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-menus/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix | 6 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-session/default.nix | 21 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/cinnamon-translations/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/cjs/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/muffin/default.nix | 21 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/nemo-extensions/srcs.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/nemo/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/pix/default.nix | 14 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/xapp/default.nix | 4 | ||||
-rw-r--r-- | pkgs/desktops/cinnamon/xviewer/default.nix | 4 |
16 files changed, 68 insertions, 61 deletions
diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix index 2d7fd0c6c022f..8b6cfb87dd127 100644 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "bulky"; - version = "2.10"; + version = "3.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "bulky"; rev = version; - hash = "sha256-3hpg9a5HU7mSSlMOWvmB/p0Mlyla5PDiS0J9iYJLr6Q="; + hash = "sha256-8/Q8ess+qF7kdjiS2y2alUSnjKlJ74yuSe4UTPVChNQ="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 3ff56b18d2557..fd1ad256d20cc 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -9,7 +9,6 @@ , cjs , evolution-data-server , fetchFromGitHub -, fetchpatch , gdk-pixbuf , gettext , libgnomekbd @@ -20,7 +19,6 @@ , intltool , json-glib , callPackage -, libsoup , libstartup_notification , libXtst , libXdamage @@ -73,25 +71,18 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "5.8.4"; + version = "6.0.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-34kOSDIU56cSZ4j0FadVfr9HLQytnK4ys88DFF7LTiM="; + hash = "sha256-kQvPdamS0t7YcWyCekdsLNXZfidaV3tdSptzHPGMSZ0="; }; patches = [ ./use-sane-install-dir.patch ./libdir.patch - - # Backport pillow 10.0.0 support. - # https://github.com/linuxmint/cinnamon/issues/11746 - (fetchpatch { - url = "https://github.com/linuxmint/cinnamon/commit/fce9aad1ebb290802dc550e8dae6344dddf9dec1.patch"; - hash = "sha256-flt7CblfXlLieAVNeC8TBnv1TX0Zca1obPWusBMnIxE="; - }) ]; buildInputs = [ @@ -108,7 +99,6 @@ stdenv.mkDerivation rec { gsound gtk3 json-glib - libsoup # referenced in js/ui/environment.js libstartup_notification libXtst libXdamage @@ -170,9 +160,10 @@ stdenv.mkDerivation rec { pushd ./files/usr/share/cinnamon/cinnamon-settings substituteInPlace ./bin/capi.py --replace '"/usr/lib"' '"${cinnamon-control-center}/lib"' - substituteInPlace ./bin/CinnamonGtkSettings.py --replace "'python3'" "'${pythonEnv.interpreter}'" substituteInPlace ./bin/SettingsWidgets.py --replace "/usr/share/sounds" "/run/current-system/sw/share/sounds" - substituteInPlace ./bin/Spices.py --replace "msgfmt" "${gettext}/bin/msgfmt" + substituteInPlace ./bin/Spices.py --replace "subprocess.run(['/usr/bin/" "subprocess.run(['" \ + --replace 'subprocess.run(["/usr/bin/' 'subprocess.run(["' \ + --replace "msgfmt" "${gettext}/bin/msgfmt" substituteInPlace ./modules/cs_info.py --replace "lspci" "${pciutils}/bin/lspci" substituteInPlace ./modules/cs_themes.py --replace "$out/share/cinnamon/styles.d" "/run/current-system/sw/share/cinnamon/styles.d" popd @@ -201,7 +192,7 @@ stdenv.mkDerivation rec { ''; passthru = { - providedSessions = [ "cinnamon" "cinnamon2d" ]; + providedSessions = [ "cinnamon" "cinnamon2d" "cinnamon-wayland" ]; }; meta = with lib; { diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index 775ab979ad8c8..40d0243b5f240 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-control-center"; - version = "5.8.2"; + version = "6.0.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-7AXm4ZTpI/4Xa2lwDmEvomNdwmgVoXSKqojpFZMuoVQ="; + hash = "sha256-zkJkZagZBt6JMiC/HLsyP9+qVLtTszumOk3PKt18X4Y="; }; buildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index e42e5a6069b9e..0f53fbbb656a6 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -10,6 +10,7 @@ , python3 , lib , stdenv +, systemd , xkeyboard_config , xorg , wrapGAppsHook @@ -18,13 +19,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-desktop"; - version = "5.8.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-rYTWtdYfMow3cIPhJdcmhyaIIU7fgVecWigbsCW0Piw="; + hash = "sha256-Ay9JyPBsE345dBwQHChkaGuoXiB2nPyvCNhWWphL8kY="; }; outputs = [ "out" "dev" ]; @@ -37,6 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ gdk-pixbuf + systemd xkeyboard_config xorg.libxkbfile xorg.libXext diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index 444a68778664d..754a5c43a182e 100644 --- a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-menus"; - version = "5.8.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-AgA/DA7I9/0AJhlmgk0yAOJaZzpiQV1vM949Y6EOWVg="; + hash = "sha256-zP1jA5Fwxh6QrM5YwJo7SFPWaxkJsv1D84dhIDP5xuI="; }; buildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 91c4955630582..1690a93364744 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -19,7 +19,6 @@ , gobject-introspection , python3 , pam -, accountsservice , cairo , xapp , xdotool @@ -29,13 +28,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "5.8.1"; + version = "6.0.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-d7h9OJ39HVQNCHNr13M1ybDFoU3Xnd1PEczGLHZU/lU="; + hash = "sha256-5hXhCPXC7b2SsmvNSLDe/WYQcufN7FfhnaAgTNtqg0I="; }; patches = [ @@ -75,7 +74,6 @@ stdenv.mkDerivation rec { xapp xdotool pam - accountsservice cairo cinnamon-desktop cinnamon-common diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 51fa5bca3dd60..a6800f94737d5 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -23,15 +23,22 @@ , pango }: +let + pythonEnv = python3.withPackages (pp: with pp; [ + pp.xapp # don't omit `pp.`, see #213561 + pygobject3 + setproctitle + ]); +in stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "5.8.1"; + version = "6.0.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-NVoP1KYh/z96NKMi9LjL4RgkjJg32oSy5WHJ91+70DI="; + hash = "sha256-9wdakMCW0RnsYdf9OmK/Q9o8m0g+5EfHVbjqvFY3d/w="; }; patches = [ @@ -40,6 +47,7 @@ stdenv.mkDerivation rec { buildInputs = [ # meson.build + cinnamon-desktop gtk3 glib libcanberra @@ -57,12 +65,11 @@ stdenv.mkDerivation rec { xorg.xtrans # other (not meson.build) - - cinnamon-desktop cinnamon-settings-daemon dbus-glib glib gsettings-desktop-schemas + pythonEnv # for cinnamon-session-quit ]; nativeBuildInputs = [ @@ -81,8 +88,10 @@ stdenv.mkDerivation rec { ]; postPatch = '' - chmod +x data/meson_install_schemas.py # patchShebangs requires executable file - patchShebangs data/meson_install_schemas.py + # patchShebangs requires executable file + chmod +x data/meson_install_schemas.py cinnamon-session-quit/cinnamon-session-quit.py + patchShebangs --build data/meson_install_schemas.py + patchShebangs --host cinnamon-session-quit/cinnamon-session-quit.py ''; preFixup = '' diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index 9eb2d743d8e4a..65828b3da6040 100644 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-settings-daemon"; - version = "5.8.1"; + version = "6.0.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-2ObfUdrCuvyhtpoxNzoH8tsFQLxNkMLQPFfJajXEsXU="; + hash = "sha256-bT6NetCBo3J9IiiJ9Hs4iC1N3n/AP9Q+6wZciuKA4i4="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix index 1c46fdcf6be00..bacd1d3518d89 100644 --- a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-translations"; - version = "5.8.2"; + version = "6.0.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-hFqCKzJogGka6vsIj8SCL9GMDsTQO50jwpYKr74V5Fo="; + hash = "sha256-lbJ4Hhd+7Hd70ZrEw0Q7Yts9yciXzqSuNTerW6oY93A="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index 681d6afd4ead2..4ff139ba787e8 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "cjs"; - version = "5.8.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cjs"; rev = version; - hash = "sha256-DKCe8dKdYfdeWQ9Iqr0AmDU7YDN9QrQGdTkrBV/ywV0="; + hash = "sha256-oSqEAZWEVb8NxFTScl8s5Mb04tCGDyVVslYW00s4YYk="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index c2ad10f97ac03..98ee19c27e783 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -6,6 +6,7 @@ , cinnamon-desktop , dbus , desktop-file-utils +, egl-wayland , glib , gnome , gobject-introspection @@ -19,6 +20,7 @@ , libinput , libstartup_notification , libwacom +, libxcvt , libXdamage , libxkbcommon , libXtst @@ -29,13 +31,16 @@ , pkg-config , python3 , udev +, wayland +, wayland-protocols , wrapGAppsHook , xorgserver +, xwayland }: stdenv.mkDerivation rec { pname = "muffin"; - version = "5.8.1"; + version = "6.0.0"; outputs = [ "out" "dev" "man" ]; @@ -43,7 +48,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-9YE+pHXJb21CcAflL9swNyhQY3ZCkLlZbnmUwTNdyfA="; + hash = "sha256-17B2C3SW9smTgLBBGJc9LwFpXoP9WidZEGgI2hbJTH8="; }; patches = [ @@ -69,6 +74,7 @@ stdenv.mkDerivation rec { cairo cinnamon-desktop dbus + egl-wayland glib gtk3 libcanberra @@ -78,10 +84,14 @@ stdenv.mkDerivation rec { libinput libstartup_notification libwacom + libxcvt libXdamage libxkbcommon pipewire udev + wayland + wayland-protocols + xwayland ]; propagatedBuildInputs = [ @@ -91,6 +101,13 @@ stdenv.mkDerivation rec { graphene ]; + mesonFlags = [ + # Based on Mint's debian/rules. + "-Degl_device=true" + "-Dwayland_eglstream=true" + "-Dxwayland_path=${lib.getExe xwayland}" + ]; + postPatch = '' patchShebangs src/backends/native/gen-default-modes.py ''; diff --git a/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix b/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix index 491373f5ea5f4..c59538a40a44e 100644 --- a/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix +++ b/pkgs/desktops/cinnamon/nemo-extensions/srcs.nix @@ -4,12 +4,12 @@ rec { # When you bump this, you should make sure all nemo-extensions # are actually using this file since we try to deal with tags # like nemo-fileroller-5.6.1 according to upstream's wishes. - version = "5.8.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = "nemo-extensions"; rev = version; - sha256 = "sha256-tyRYPWJa93w05a0PcYvz1GA8/xX2kHLdIzz4tCcppiY="; + sha256 = "sha256-M8ImntyfFfSL591UpqZosE7F8ydbpfrBhcLOBtW/sGQ="; }; } diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 61266bb871006..406bcd1325110 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.8.5"; + version = "6.0.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-Nl/T+8mmQdCTHo3qAUd+ATflSDXiGCQfGb1gXzvLuAc="; + sha256 = "sha256-JeiBhgfGyGyNT9eNhtUl6Pp1jgG02NRlm5lam592lS0="; }; patches = [ diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix index ef434171d914f..d9324fb30d24d 100644 --- a/pkgs/desktops/cinnamon/pix/default.nix +++ b/pkgs/desktops/cinnamon/pix/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , pkg-config , meson , ninja @@ -34,24 +33,15 @@ stdenv.mkDerivation rec { pname = "pix"; - version = "3.0.2"; + version = "3.2.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-iNUhcHG4nCZ4WNELodyLdztzfNg9g+F0eQrZHXS6Zj0="; + sha256 = "sha256-hhtW2QyexGIyovhWOReeJ0bxgye8LJl1RrEs0/5+q24="; }; - patches = [ - # Fix build with exiv2 0.28, can be removed on next update - # https://github.com/linuxmint/pix/pull/178 - (fetchpatch { - url = "https://github.com/linuxmint/pix/commit/46e19703a973d51fa97e6a22121560f5ba200eea.patch"; - sha256 = "sha256-Z+pUxoy0m/agXW++YxEUhRuax0qvuGVXNhU8d9mvGh4="; - }) - ]; - nativeBuildInputs = [ bison desktop-file-utils diff --git a/pkgs/desktops/cinnamon/xapp/default.nix b/pkgs/desktops/cinnamon/xapp/default.nix index 5b38d0662ea55..3043d7c7ed4fc 100644 --- a/pkgs/desktops/cinnamon/xapp/default.nix +++ b/pkgs/desktops/cinnamon/xapp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { pname = "xapp"; - version = "2.6.1"; + version = "2.8.0"; outputs = [ "out" "dev" ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-ZxIPiDLcMHEmlnrImctI2ZfH3AIOjB4m/RPGipJ7koM="; + hash = "sha256-kpVNzBvUo2Ktzln51xLbySeKutVeJaI57kL8cBZscTM="; }; # Recommended by upstream, which enables the build of xapp-debug. diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix index c03ba5145b5ef..1c7e03de9204f 100644 --- a/pkgs/desktops/cinnamon/xviewer/default.nix +++ b/pkgs/desktops/cinnamon/xviewer/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "xviewer"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-HVxCBqaKtsEGhGAB+dBCOnjAjLZHv0XqTifPrvoYdj8="; + sha256 = "sha256-bI0TFJYulj1XlgKU5YLrlYKnkHORVYz4TK9mhl9mGag="; }; nativeBuildInputs = [ |