diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 2e3dfea8cb6e..0cd3c3f4f2f0 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -95,6 +95,11 @@ PHP now defaults to PHP 8.1, updated from 8.0. + + + Cinnamon has been updated to 5.4. + + hardware.nvidia has a new option diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 6bc7d1917cae..617096a9fcf3 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -46,6 +46,8 @@ In addition to numerous new and upgraded packages, this release has the followin - PHP now defaults to PHP 8.1, updated from 8.0. +- Cinnamon has been updated to 5.4. + - `hardware.nvidia` has a new option `open` that can be used to opt in the opensource version of NVIDIA kernel driver. Note that the driver's support for GeForce and Workstation GPUs is still alpha quality, see [NVIDIA Releases Open-Source GPU Kernel Modules](https://developer.nvidia.com/blog/nvidia-releases-open-source-gpu-kernel-modules/) for the official announcement. diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index d54f99c2cd5c..5a7d9e28b5c7 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -82,6 +82,7 @@ in ''; # Default services + services.blueman.enable = mkDefault true; hardware.bluetooth.enable = mkDefault true; hardware.pulseaudio.enable = mkDefault true; security.polkit.enable = true; @@ -91,7 +92,7 @@ in cinnamon-common cinnamon-screensaver nemo - xapps + xapp ]; services.cinnamon.apps.enable = mkDefault true; services.gnome.glib-networking.enable = true; @@ -199,13 +200,12 @@ in environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; utils.removePackagesByName [ # cinnamon team apps bulky - blueberry warpinator - # cinnamon xapps + # cinnamon xapp xviewer xreader - xed + xed-editor xplayer pix diff --git a/pkgs/applications/backup/timeshift/unwrapped.nix b/pkgs/applications/backup/timeshift/unwrapped.nix index 65db24062620..61964370b3e2 100644 --- a/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/pkgs/applications/backup/timeshift/unwrapped.nix @@ -10,18 +10,18 @@ , libgee , util-linux , vte -, xapps +, xapp }: stdenv.mkDerivation rec { pname = "timeshift"; - version = "22.06.1"; + version = "22.06.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = "timeshift"; - rev = "v${version}"; - sha256 = "XcxwVBKMv2YwbrI3FFWDQFs8hHruhkZq3YqzkptE6KE="; + rev = version; + sha256 = "IHX/F3tnl3ckX20mnPHmuK/W4pRTFHzBUfaJg2sMpqc="; }; patches = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { json-glib libgee vte - xapps + xapp ]; preBuild = '' diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index 7e36aeccdec7..0cbca2ea2bde 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -1,39 +1,40 @@ { stdenv , lib , fetchFromGitHub -, cmake , libxml2 , libpeas , glib , gtk3 , gtksourceview4 , gspell -, xapps +, xapp , pkg-config +, python3 , meson , ninja , wrapGAppsHook , intltool -, itstool }: +, itstool +}: stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.2.2"; + version = "3.2.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - sha256 = "sha256-PW7y3+Sa9FH5r5xvziysvxM08RJCPvnLs3wsm5IqToQ="; + sha256 = "sha256-aO5ilmlkSAxlkWYdSLmrcm7pC8GbITpCitd4TXp5tfY="; }; nativeBuildInputs = [ meson - cmake pkg-config intltool itstool ninja + python3 wrapGAppsHook ]; @@ -44,13 +45,9 @@ stdenv.mkDerivation rec { gtksourceview4 libpeas gspell - xapps + xapp ]; - postInstall = '' - glib-compile-schemas $out/share/glib-2.0/schemas - ''; - doInstallCheck = true; installCheckPhase = '' if [[ "$($out/bin/xed --version)" == "xed - Version ${version}" ]] ; then diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix index 9039854f74e3..a66fecd83b76 100644 --- a/pkgs/applications/misc/sticky/default.nix +++ b/pkgs/applications/misc/sticky/default.nix @@ -11,14 +11,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sticky"; - version = "1.8"; + version = "1.11"; format = "other"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-VSD/QsG7G9hji5m6NSEkCoVM+XK3t4KmCqbocTbZwE4="; + hash = "sha256-PXJpNKzF9goQvfh3lUUfOaZFessFNrWtg8nMDxPxRMo="; }; postPatch = '' @@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ glib gobject-introspection - cinnamon.xapps + cinnamon.xapp gspell ]; diff --git a/pkgs/applications/video/hypnotix/default.nix b/pkgs/applications/video/hypnotix/default.nix index ad149b947e48..af6d9fe702c4 100644 --- a/pkgs/applications/video/hypnotix/default.nix +++ b/pkgs/applications/video/hypnotix/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "hypnotix"; - version = "2.8"; + version = "2.9"; src = fetchFromGitHub { owner = "linuxmint"; repo = "hypnotix"; rev = version; - hash = "sha256-uj5Bn3K9SCKE4p1jylfQ8XnAwNnN4VXHLMLrwhKhzsk="; + hash = "sha256-jjCyO6lyhqH4xeNp5uy/KqNr5Mvv+45pJGHFOXNi0rk="; }; patches = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { dontWrapGApps = true; buildInputs = [ - cinnamon.xapps + cinnamon.xapp ]; pythonPath = with python3.pkgs; [ diff --git a/pkgs/applications/video/xplayer/default.nix b/pkgs/applications/video/xplayer/default.nix index 9d6a5e18ad5d..3bbbb115fbea 100644 --- a/pkgs/applications/video/xplayer/default.nix +++ b/pkgs/applications/video/xplayer/default.nix @@ -22,7 +22,7 @@ , pkg-config , python3 , wrapGAppsHook -, xapps +, xapp , yelp-tools }: let @@ -34,13 +34,13 @@ in stdenv.mkDerivation rec { pname = "xplayer"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-qoBJKY0CZyhp9foUehq5hInEENRGZuy1D6jAMjbjYhA="; + sha256 = "sha256-0hQHhf2me28YTTKOzEkzoxRoSoHLwtiaHPKNPJ/Fg+0="; }; # configure wants to find gst-inspect-1.0 via pkgconfig but @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { libxml2 libxplayer-plparser pythonenv - xapps + xapp # to satisfy configure script pythonenv.pkgs.pygobject3 ]; diff --git a/pkgs/desktops/cinnamon/bulky/default.nix b/pkgs/desktops/cinnamon/bulky/default.nix index 56cf5a0ff515..bc60bc6bf9d1 100644 --- a/pkgs/desktops/cinnamon/bulky/default.nix +++ b/pkgs/desktops/cinnamon/bulky/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , wrapGAppsHook , python3 +, gobject-introspection , gsettings-desktop-schemas , gettext , gtk3 @@ -12,13 +13,13 @@ stdenv.mkDerivation rec { pname = "bulky"; - version = "1.9"; + version = "2.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = "bulky"; rev = version; - hash = "sha256-OCBFhlnEXZROp47KDiy7Y6l4GDVCCP+i1IFYQa7esyg="; + hash = "sha256-ynPorkhT/LUkFGNRG6JLDYaQjNPm2vMzthvl0wr7J/M="; }; nativeBuildInputs = [ @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ (python3.withPackages (p: with p; [ pygobject3 magic setproctitle ])) + gobject-introspection gsettings-desktop-schemas gtk3 glib @@ -50,6 +52,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas + ''; + meta = with lib; { description = "Bulk rename app"; homepage = "https://github.com/linuxmint/bulky"; diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 303443cc5f9e..87d500cf617b 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -1,6 +1,5 @@ { atk , cacert -, fetchpatch , dbus , cinnamon-control-center , cinnamon-desktop @@ -8,11 +7,13 @@ , cinnamon-session , cinnamon-translations , cjs +, clutter , fetchFromGitHub , gdk-pixbuf , libgnomekbd , glib , gobject-introspection +, gsound , gtk3 , intltool , json-glib @@ -34,7 +35,7 @@ , python3 , keybinder3 , cairo -, xapps +, xapp , upower , nemo , libnotify @@ -47,41 +48,51 @@ , meson , ninja , gst_all_1 +, perl }: stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "5.2.0"; + version = "5.4.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-B2Du2zis0xWeeyh3kSyz1doWImk9Fuk4qQ8HNZZdqdw="; + hash = "sha256-Z+BbvLgH4gOsLMSC0r5Hp9yDZz4XMH7NR/A9to+/djA="; }; patches = [ ./use-sane-install-dir.patch ./libdir.patch - - (fetchpatch { - url = "https://github.com/linuxmint/cinnamon/commit/77ed66050f7df889fcb7a10b702c7b8bcdeaa130.patch"; - sha256 = "sha256-OegLxz6Xr/nxVwVOAd2oOY62ohZ3r6uYn1+YED5EBHQ="; - }) ]; buildInputs = [ - # TODO: review if we really need this all - (python3.withPackages (pp: with pp; [ dbus-python setproctitle pygobject3 pycairo xapp pillow pytz tinycss2 python-pam pexpect distro requests ])) + (python3.withPackages (pp: with pp; [ + dbus-python + setproctitle + pygobject3 + pycairo + python3.pkgs.xapp # The scope prefix is required + pillow + pytz + tinycss2 + python-pam + pexpect + distro + requests + ])) atk cacert cinnamon-control-center cinnamon-desktop cinnamon-menus cjs + clutter dbus gdk-pixbuf glib + gsound gtk3 json-glib libsoup @@ -101,7 +112,7 @@ stdenv.mkDerivation rec { gnome.caribou keybinder3 upower - xapps + xapp timezonemap nemo libnotify @@ -120,6 +131,7 @@ stdenv.mkDerivation rec { wrapGAppsHook intltool gtk-doc + perl ]; # use locales from cinnamon-translations (not using --localedir because datadir is used) @@ -135,8 +147,8 @@ stdenv.mkDerivation rec { sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py - sed "s|/usr/bin/upload-system-info|${xapps}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py - sed "s|upload-system-info|${xapps}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py + sed "s|/usr/bin/upload-system-info|${xapp}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py + sed "s|upload-system-info|${xapp}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py sed "s|/usr/bin/cinnamon-control-center|${cinnamon-control-center}/bin/cinnamon-control-center|g" -i ./files/usr/bin/cinnamon-settings # this one really IS optional @@ -151,6 +163,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 + + patchShebangs src/data-to-c.pl ''; passthru = { diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index a105f39ac46a..6a8e344ba47c 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , pkg-config , glib , gettext @@ -14,7 +15,6 @@ , polkit , libxkbfile , cinnamon-menus -, dbus-glib , libgnomekbd , libxklavier , networkmanager @@ -31,17 +31,27 @@ , ninja , cinnamon-translations , python3 +, upower }: stdenv.mkDerivation rec { pname = "cinnamon-control-center"; - version = "5.2.0"; + version = "5.4.4"; + + patches = [ + # Add missing gio-unix-2.0 dependency, can be removed on next update + # https://github.com/linuxmint/cinnamon-control-center/pull/294 + (fetchpatch { + url = "https://github.com/linuxmint/cinnamon-control-center/commit/7f5ba6e7a691547840f8482445c09c729e10a397.patch"; + sha256 = "sha256-xcf/O/DfhOvCpWJl0XZD+xAwWs4STAeCaFMZ9Lftv2w="; + }) + ]; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-j7+2uLcHr7bO7i8OGqkw3ifawZULNyihhJ+h2D5gx/k="; + hash = "sha256-c2JbRAMcTnqaqt8MXQl4AxnENVmfYyHcCteWBWQUSO0="; }; buildInputs = [ @@ -51,7 +61,6 @@ stdenv.mkDerivation rec { libnotify cinnamon-menus libxml2 - dbus-glib polkit libgnomekbd libxklavier @@ -66,6 +75,7 @@ stdenv.mkDerivation rec { xorg.libXxf86misc xorg.libxkbfile gdk-pixbuf + upower ]; /* ./panels/datetime/test-timezone.c:4:#define TZ_DIR "/usr/share/zoneinfo/" @@ -88,8 +98,6 @@ stdenv.mkDerivation rec { ''; mesonFlags = [ - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" # use locales from cinnamon-translations "--localedir=${cinnamon-translations}/share/locale" ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index ec786c7bacb9..0b9e10e74027 100644 --- a/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-desktop"; - version = "5.2.0"; + version = "5.4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-gOlSmcHjBjnLdDpgC5mZ4M3eUBTG3BuET6Kr/Xby14A="; + hash = "sha256-U05JiW6PaRAEEQ/uq3wmZSQGohMz4M86Ji9pBl2Azg8="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix index 3066d7fcd807..a3456755045f 100644 --- a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix @@ -10,7 +10,7 @@ , muffin , nemo -, xapps +, xapp , cinnamon-desktop , cinnamon-session , cinnamon-settings-daemon @@ -28,7 +28,7 @@ let bulky muffin nemo - xapps + xapp cinnamon-desktop cinnamon-session cinnamon-settings-daemon diff --git a/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index 99008b4726ee..c3a60d684781 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.2.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-ioluv/GdWCNGP2jQqsyEbHncCFm8iu69yR8QVKQTJk8="; + hash = "sha256-Q4bgaX8nGSWHKHR3+hFTlHtNhSmZW8ZEHi8DaXKQ+fM="; }; buildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 3d84a6a0622c..23be4175ab6d 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , pkg-config , meson , ninja @@ -21,20 +22,30 @@ , pam , accountsservice , cairo -, xapps +, xapp +, xdotool , xorg , iso-flags-png-320x420 }: stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "5.2.0"; + version = "5.4.1"; + + patches = [ + # Add missing gio-unix-2.0 dependency, can be removed on next update + # https://github.com/linuxmint/cinnamon-screensaver/pull/411 + (fetchpatch { + url = "https://github.com/linuxmint/cinnamon-screensaver/commit/8d658e7f313879579322dce666551f132795540b.patch"; + sha256 = "sha256-HjVQSX2yYqgZVIio2I8GBWLYOddvaFiqZzf0zaYf+OE="; + }) + ]; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-weQ5sw5SY89JFIxamCeLiSLy8xCXGg0Yxj/5Ca5r+6o="; + hash = "sha256-PpBtLAIboXMnX5V/u06aoZ6WfPrn4mdCu0NXTGb6pAE="; }; nativeBuildInputs = [ @@ -60,8 +71,14 @@ stdenv.mkDerivation rec { xorg.libX11 xorg.libXrandr - (python3.withPackages (pp: with pp; [ pygobject3 setproctitle xapp pycairo ])) - xapps + (python3.withPackages (pp: with pp; [ + pygobject3 + setproctitle + python3.pkgs.xapp # The scope prefix is required + pycairo + ])) + xapp + xdotool pam accountsservice cairo @@ -74,11 +91,6 @@ stdenv.mkDerivation rec { iso-flags-png-320x420 ]; - mesonFlags = [ - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" - ]; - postPatch = '' # cscreensaver hardcodes absolute paths everywhere. Nuke from orbit. find . -type f -exec sed -i \ diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 91c03796a888..261433e65872 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -3,8 +3,6 @@ , cinnamon-settings-daemon , cinnamon-translations , dbus-glib -, docbook_xsl -, docbook_xml_dtd_412 , glib , gsettings-desktop-schemas , gtk3 @@ -19,8 +17,7 @@ , stdenv , systemd , wrapGAppsHook -, xapps -, xmlto +, xapp , xorg , libexecinfo , pango @@ -28,13 +25,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "5.2.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-E5ascwLnpa5NSBAPo9dXRhoraUntzDPHVV32uDU4U8k="; + hash = "sha256-m16nf3eC15ZT8eDvRTylBfxsnShkU1Sm8J9qcRGeGQo="; }; patches = [ @@ -49,7 +46,7 @@ stdenv.mkDerivation rec { pango xorg.libX11 xorg.libXext - xapps + xapp xorg.libXau xorg.libXcomposite @@ -73,18 +70,12 @@ stdenv.mkDerivation rec { ninja wrapGAppsHook libexecinfo - docbook_xsl - docbook_xml_dtd_412 python3 pkg-config libxslt - xmlto ]; mesonFlags = [ - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" - "-Dgconf=false" # use locales from cinnamon-translations "--localedir=${cinnamon-translations}/share/locale" ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index bf83c3d9f594..d4d05df8f558 100644 --- a/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -12,7 +12,6 @@ , libxklavier , wrapGAppsHook , pkg-config -, pulseaudio , lib , stdenv , systemd @@ -30,28 +29,17 @@ , libgudev , meson , ninja -, dbus -, dbus-glib }: stdenv.mkDerivation rec { pname = "cinnamon-settings-daemon"; - version = "5.2.0"; - - /* csd-power-manager.c:50:10: fatal error: csd-power-proxy.h: No such file or directory - #include "csd-power-proxy.h" - ^~~~~~~~~~~~~~~~~~~ - compilation terminated. */ - - # but this occurs only sometimes, so disabling parallel building - # also see https://github.com/linuxmint/cinnamon-settings-daemon/issues/248 - enableParallelBuilding = false; + version = "5.4.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-6omif4UxMrXWxL+R9lQ8ogxotW+3E9Kp99toH3PJtaU="; + hash = "sha256-3ELsb0hH7GjMjwjsIg2m8k/EBCHIQGW3O7eDaqT2V7I="; }; patches = [ @@ -59,8 +47,6 @@ stdenv.mkDerivation rec { ./use-sane-install-dir.patch ]; - mesonFlags = [ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ]; - buildInputs = [ cinnamon-desktop colord @@ -72,7 +58,6 @@ stdenv.mkDerivation rec { libgnomekbd libnotify libxklavier - pulseaudio systemd upower dconf @@ -89,8 +74,6 @@ stdenv.mkDerivation rec { fontconfig nss libgudev - dbus - dbus-glib ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/pkgs/desktops/cinnamon/cinnamon-translations/default.nix index f9337f764926..195d0268f3b1 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.2.0"; + version = "5.4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-t3PydmS2+LU++2NcosgMr9KTXW0Qy1Re9+YcS3KMDi8="; + hash = "sha256-vt60qarNfTX9R5kGOeUBCskKK2zLdEE+ACT0EGvUeao="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index 3ac4483c5c9a..74b105381836 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -8,7 +8,7 @@ , python3 , cairo , gnome -, xapps +, xapp , keybinder3 , upower , callPackage @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "cjs"; - version = "5.2.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cjs"; rev = version; - hash = "sha256-06sTk513qVMdznSHJzzB3XIPTcfjgxTB2o+ALqwPpHM="; + hash = "sha256-8LIVM9+Wt9V7iKUwqTBUTf8LiQ16NE3CYtCJknjl56o="; }; outputs = [ "out" "dev" ]; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { gnome.caribou keybinder3 upower - xapps + xapp ]; mesonFlags = [ diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 7f9d332ed140..5a803c6d487c 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib }: +{ config, pkgs, lib }: lib.makeScope pkgs.newScope (self: with self; { iso-flags-png-320x420 = pkgs.iso-flags.overrideAttrs (p: p // { @@ -31,8 +31,11 @@ lib.makeScope pkgs.newScope (self: with self; { mint-y-icons = callPackage ./mint-y-icons { }; muffin = callPackage ./muffin { }; pix = callPackage ./pix { }; - xapps = callPackage ./xapps { }; + xapp = callPackage ./xapp { }; warpinator = callPackage ./warpinator { }; xreader = callPackage ./xreader { }; xviewer = callPackage ./xviewer { }; -}) +}) // lib.optionalAttrs config.allowAliases { + # Aliases need to be outside the scope or they will shadow the attributes from parent scope. + xapps = pkgs.cinnamon.xapp; # added 2022-07-27 +} diff --git a/pkgs/desktops/cinnamon/mint-artwork/default.nix b/pkgs/desktops/cinnamon/mint-artwork/default.nix index abc7c172cb77..16ad17294071 100644 --- a/pkgs/desktops/cinnamon/mint-artwork/default.nix +++ b/pkgs/desktops/cinnamon/mint-artwork/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "mint-artwork"; - version = "1.5.4"; + version = "1.6.0"; src = fetchurl { url = "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"; - hash = "sha256-ZRJK1fzIF36BdUlVhLwdFdfgQvN2ashzjgpCxoOIbK8="; + hash = "sha256-un5T56zzN2vRVp42RHczDEKwrweSeygASkFJU5LXCDo="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/desktops/cinnamon/mint-themes/default.nix index f25cb9df2fdd..db57de2aee07 100644 --- a/pkgs/desktops/cinnamon/mint-themes/default.nix +++ b/pkgs/desktops/cinnamon/mint-themes/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "mint-themes"; - version = "1.8.8"; + version = "2.0.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # they don't exactly do tags, it's just a named commit - rev = "a833fba6917043bf410dee4364c9a36af1ce4c83"; - hash = "sha256-8abjjD0XoApvqB8SNlWsqIEp7ozgiERGS0kWglw2DWA="; + rev = "38b5606c3889a9a0bac0e2ab39196f675496982c"; + hash = "sha256-Cc5p9WWLFPQ8K0CpL236LilAgBuO6HdfGt/rb0wiVpc="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/pkgs/desktops/cinnamon/mint-x-icons/default.nix index bfcc95c4ff93..2a57e0571ed2 100644 --- a/pkgs/desktops/cinnamon/mint-x-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-x-icons/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "mint-x-icons"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # they don't exactly do tags, it's just a named commit - rev = "286eb4acdfc3e3c77572dfd0cd70ffd4208d3a35"; - hash = "sha256-mZkCEBC1O2mW8rM1kpOWdC5CwIeafyBS95cMY6x1yco="; + rev = "4ab3c314db1b3751d87d5769629b28ac0ca3c671"; + hash = "sha256-cPRae3EjzVtAL1Ei2LB4UNUU/m87mFT94xY/NnNR6JM="; }; propagatedBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index c1afd2828d2c..48df2b260ca7 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "mint-y-icons"; - version = "1.5.8"; + version = "1.6.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # they don't exactly do tags, it's just a named commit - rev = "9489bd161e9503d071227dd36057386a34cfc0a3"; - hash = "sha256-53yTCWNSJjCpVvrxLfsiaCPNDEZWxJgGVAmVNMNql2M="; + rev = "6294c4538a08a2a6c5fd68e223472d9c144ff8b0"; + hash = "sha256-6tR3OFvU1ID61n4gr0R6pJyo3CjKvu8mgtXzMOINgq0="; }; propagatedBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index 6f35d6b5901d..c7d803ed5aca 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -1,100 +1,104 @@ -{ fetchFromGitHub +{ stdenv +, lib +, fetchFromGitHub +, substituteAll +, cairo , cinnamon-desktop +, dbus +, desktop-file-utils , glib -, file , gnome -, gnome-doc-utils -, fetchpatch , gobject-introspection +, graphene , gtk3 -, intltool , json-glib +, libcanberra +, libdrm +, libgnomekbd +, libgudev , libinput , libstartup_notification -, libXtst +, libwacom +, libXdamage , libxkbcommon +, libXtst +, mesa +, meson +, ninja +, pipewire , pkg-config -, lib -, stdenv +, python3 , udev -, xorg , wrapGAppsHook -, pango -, cairo -, gtk-doc -, docbook_xsl -, docbook_xml_dtd_43 -, docbook_xml_dtd_42 -, docbook_xml_dtd_412 -, autoconf -, automake -, gettext -, libtool +, xorgserver }: -# it's a frankensteins monster with some cinnamon sparkles added on top of it - stdenv.mkDerivation rec { pname = "muffin"; - version = "5.2.0"; + version = "5.4.4"; + + outputs = [ "out" "dev" "man" ]; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + zenity = gnome.zenity; + }) + ]; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-WAp0HbfRtwsPjJX1kPBqUStqLaudQPZ8E+h4jmggmw8="; + hash = "sha256-u3PNSyjxtPLFdA+2Iz+NuqlcQC9IwsFb7Tb5eVAJunY="; }; - buildInputs = [ - gtk3 - glib - pango - cairo - json-glib - cinnamon-desktop - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libxkbfile - xorg.xkeyboardconfig + nativeBuildInputs = [ + desktop-file-utils + mesa # needed for gbm + meson + ninja + pkg-config + python3 + wrapGAppsHook + xorgserver # for cvt command + ]; - libxkbcommon - gnome.zenity + buildInputs = [ + cairo + cinnamon-desktop + dbus + glib + gobject-introspection + gtk3 + libcanberra + libdrm + libgnomekbd + libgudev libinput libstartup_notification - libXtst + libwacom + libXdamage + libxkbcommon + pipewire udev - gobject-introspection ]; - nativeBuildInputs = [ - autoconf - automake - gettext - libtool - wrapGAppsHook - pkg-config - intltool - - gnome-doc-utils - gtk-doc - docbook_xsl - docbook_xml_dtd_43 - docbook_xml_dtd_42 - docbook_xml_dtd_412 + propagatedBuildInputs = [ + # required for pkg-config to detect muffin-clutter + json-glib + libXtst + graphene ]; - preConfigure = '' - NOCONFIGURE=1 ./autogen.sh + postPatch = '' + patchShebangs src/backends/native/gen-default-modes.py ''; meta = with lib; { homepage = "https://github.com/linuxmint/muffin"; description = "The window management library for the Cinnamon desktop (libmuffin) and its sample WM binary (muffin)"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = teams.cinnamon.members; }; diff --git a/pkgs/desktops/cinnamon/muffin/fix-paths.patch b/pkgs/desktops/cinnamon/muffin/fix-paths.patch new file mode 100644 index 000000000000..6ac0a431f61f --- /dev/null +++ b/pkgs/desktops/cinnamon/muffin/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/core/util.c b/src/core/util.c +index 57b73747d..f424cc81c 100644 +--- a/src/core/util.c ++++ b/src/core/util.c +@@ -636,7 +636,7 @@ meta_show_dialog (const char *type, + + args = g_ptr_array_new (); + +- append_argument (args, "zenity"); ++ append_argument (args, "@zenity@/bin/zenity"); + append_argument (args, type); + + if (display) diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index e8bf145e5028..4b013050ad84 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -10,10 +10,9 @@ , wrapGAppsHook , libxml2 , gtk3 -, libnotify , gvfs , cinnamon-desktop -, xapps +, xapp , libexif , exempi , intltool @@ -24,7 +23,7 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "5.2.4"; + version = "5.4.2"; # TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327) @@ -32,7 +31,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-v63dFiBKtLCmRnwJ6u814lSv+tfPG+IIJtcWCnOEZjk="; + sha256 = "sha256-Xn9CgGe7j2APaJRLvx58z2w+sN7ZeDScQz53ZBBnsQs="; }; outputs = [ "out" "dev" ]; @@ -40,10 +39,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 - libnotify cinnamon-desktop libxml2 - xapps + xapp libexif exempi gvfs @@ -61,8 +59,6 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" # use locales from cinnamon-translations "--localedir=${cinnamon-translations}/share/locale" ]; diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix index b5477cfeb0d8..ebd116882a8c 100644 --- a/pkgs/desktops/cinnamon/pix/default.nix +++ b/pkgs/desktops/cinnamon/pix/default.nix @@ -16,7 +16,7 @@ , pkg-config , shared-mime-info , wrapGAppsHook -, xapps +, xapp , yelp-tools , libsecret , webkitgtk @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "pix"; - version = "2.8.4"; + version = "2.8.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-yB8nLGvJZOViD+i4IkKN0yCDl5wRCvEbjzPDs7ZRMNA="; + sha256 = "sha256-aID0jxOMFegkcAflTY0VevZyN1HFivkTFi3has8MOY0="; }; nativeBuildInputs = [ @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 - xapps + xapp libsecret webkitgtk libwebp diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index 8ed66dc54d55..ecd4aeec16c9 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { pname = "warpinator"; - version = "1.2.5"; + version = "1.2.13"; format = "other"; @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-pTLM4CrkBLEZS9IdM9IBSGH0WPOj1rlAgvWLOUy6MxY="; + hash = "sha256-iLImyfUsfn+mWrgMv5NnbOvvOlJnwJG4Btx1wwlgTeM="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/cinnamon/xapps/default.nix b/pkgs/desktops/cinnamon/xapp/default.nix similarity index 77% rename from pkgs/desktops/cinnamon/xapps/default.nix rename to pkgs/desktops/cinnamon/xapp/default.nix index 7927026166a1..655284f20d82 100644 --- a/pkgs/desktops/cinnamon/xapps/default.nix +++ b/pkgs/desktops/cinnamon/xapp/default.nix @@ -1,4 +1,5 @@ { fetchFromGitHub +, fetchpatch , glib , gobject-introspection , gtk3 @@ -21,23 +22,27 @@ }: stdenv.mkDerivation rec { - pname = "xapps"; - version = "2.2.8"; + pname = "xapp"; + version = "2.2.14"; outputs = [ "out" "dev" ]; + patches = [ + # Add missing gio-unix-2.0 dependency, can be removed on next update + # https://github.com/linuxmint/xapp/pull/156 + (fetchpatch { + url = "https://github.com/linuxmint/xapp/commit/052081f75d1c1212aeb6a913772723c81607bcb3.patch"; + sha256 = "sha256-VL70Y1FIa7lQ/zKjEx0GhaU1QRu4z6Yu400/bDbgZgM="; + }) + ]; + src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-70troRGklu5xGjBIrGvshcOX/UT96hIEFXyo4yj2GT4="; + hash = "sha256-BebsS7y/hRQSc4rYOIWJ+sSJ5fLZaCpNAE48JnviUUc="; }; - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - NIX_CFLAGS_COMPILE = [ - "-I${glib.dev}/include/gio-unix-2.0" - ]; - nativeBuildInputs = [ meson ninja @@ -91,7 +96,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/linuxmint/xapps"; + homepage = "https://github.com/linuxmint/xapp"; description = "Cross-desktop libraries and common resources"; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/desktops/cinnamon/xreader/default.nix b/pkgs/desktops/cinnamon/xreader/default.nix index 9864e1c0e18b..67983d505694 100644 --- a/pkgs/desktops/cinnamon/xreader/default.nix +++ b/pkgs/desktops/cinnamon/xreader/default.nix @@ -8,7 +8,7 @@ , gtk3 , wrapGAppsHook , libxml2 -, xapps +, xapp , meson , pkg-config , cairo @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "3.3.0"; + version = "3.4.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-wBrP5SHGPvH/Gz9QY253zQuf8WSjV19oNB5aIqXGLZ8="; + sha256 = "sha256-GkJo/wc5StyeQv0pv5XK0Qy3o8EGpfPYY8gOMq0Afgs="; }; nativeBuildInputs = [ @@ -47,13 +47,12 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dmathjax-directory=${nodePackages.mathjax}" - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ] ++ (map (x: "-D${x}=true") backends); buildInputs = [ glib gtk3 - xapps + xapp cairo libxml2 libsecret diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix index 5f5720c253b0..c0dc50182c01 100644 --- a/pkgs/desktops/cinnamon/xviewer/default.nix +++ b/pkgs/desktops/cinnamon/xviewer/default.nix @@ -1,64 +1,67 @@ { stdenv , lib , fetchFromGitHub -, autoreconfHook , cinnamon-desktop -, file +, docbook_xsl +, exempi , gdk-pixbuf , glib , gobject-introspection -, gtk-doc , gtk3 -, intltool +, gtk-doc , itstool , lcms2 , libexif , libjpeg , libpeas -, libtool +, librsvg , libxml2 +, meson +, ninja , pkg-config -, shared-mime-info +, python3 , wrapGAppsHook -, xapps +, xapp , yelp-tools }: stdenv.mkDerivation rec { pname = "xviewer"; - version = "3.2.4"; + version = "3.2.9"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-OyHSBXtJ/TExl06NLUAaIZq4u0+fI3YGQ37HRZeNP+0="; + sha256 = "sha256-sDDQ/LGhHH13gRjVfpTyHYsYhelp80KNE75I8AlskoU="; }; nativeBuildInputs = [ - wrapGAppsHook - autoreconfHook cinnamon-desktop + docbook_xsl gdk-pixbuf gobject-introspection gtk-doc - intltool itstool - libtool + meson + ninja pkg-config + python3 + wrapGAppsHook yelp-tools ]; buildInputs = [ + exempi glib gtk3 + lcms2 libexif libjpeg libpeas + librsvg libxml2 - shared-mime-info - xapps - lcms2 + xapp ]; meta = with lib; { diff --git a/pkgs/development/python-modules/xapp/default.nix b/pkgs/development/python-modules/xapp/default.nix index 7cb664d77fcd..ba48de4de7e1 100644 --- a/pkgs/development/python-modules/xapp/default.nix +++ b/pkgs/development/python-modules/xapp/default.nix @@ -5,19 +5,19 @@ , pygobject3 , gtk3 , gobject-introspection -, xapps +, xapp , polkit }: buildPythonPackage rec { pname = "xapp"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "python-xapp"; rev = version; - hash = "sha256-UC+0nbf+SRQsF5R0LcrPpmNbaoRM14DC82JccSpsKsY="; + hash = "sha256-ntjJ/O6HiRZMsqsuQY4HLM4fBE0aWpn/L4n5YCRlhhg="; }; propagatedBuildInputs = [ @@ -25,7 +25,7 @@ buildPythonPackage rec { pygobject3 gtk3 gobject-introspection - xapps + xapp polkit ]; diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index 3954d3f5cd9b..9208e286c9b4 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ bluez-tools - cinnamon.xapps + cinnamon.xapp gnome.gnome-bluetooth_1_0 python3Packages.python util-linux diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e2c1fd01cc6..ac9dd2071bda 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30842,7 +30842,7 @@ with pkgs; timelimit = callPackage ../tools/misc/timelimit { }; - timeshift-unwrapped = callPackage ../applications/backup/timeshift/unwrapped.nix { inherit (cinnamon) xapps; }; + timeshift-unwrapped = callPackage ../applications/backup/timeshift/unwrapped.nix { inherit (cinnamon) xapp; }; timeshift = callPackage ../applications/backup/timeshift { grubPackage = grub2_full; }; @@ -31590,7 +31590,7 @@ with pkgs; xdotool = callPackage ../tools/X11/xdotool { }; xed-editor = callPackage ../applications/editors/xed-editor { - xapps = cinnamon.xapps; + xapp = cinnamon.xapp; }; xenPackages = recurseIntoAttrs (callPackage ../applications/virtualization/xen/packages.nix {}); @@ -31700,7 +31700,7 @@ with pkgs; xplayer = callPackage ../applications/video/xplayer { inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad; - inherit (cinnamon) xapps; + inherit (cinnamon) xapp; }; libxplayer-plparser = callPackage ../applications/video/xplayer/plparser.nix { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec94e040a97c..ec6e7eaaa7a6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11494,7 +11494,7 @@ in { xapp = callPackage ../development/python-modules/xapp { inherit (pkgs) gtk3 gobject-introspection polkit; - inherit (pkgs.cinnamon) xapps; + inherit (pkgs.cinnamon) xapp; }; xarray = callPackage ../development/python-modules/xarray { };