Unverified Commit 0059f767 authored by K900's avatar K900 Committed by GitHub
Browse files

Merge pull request #211767 from K900/plasma-5.27 

Plasma 5.27
parents fffcd790 a217df51

nixos/doc/manual/release-notes/rl-2305.section.md

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ In addition to numerous new and upgraded packages, this release has the followin 


- Cinnamon has been updated to 5.6, see [the pull request](https://github.com/NixOS/nixpkgs/pull/201328#issue-1449910204) for what is changed.



- KDE Plasma has been updated to v5.27, see [the release notes](https://kde.org/announcements/plasma/5/5.27.0/) for what is changed.



- `nixos-rebuild` now supports an extra `--specialisation` option that can be used to change specialisation for `switch` and `test` commands.



## New Services {#sec-release-23.05-new-services}

nixos/modules/services/x11/desktop-managers/plasma5.nix

+2 −1
Original line number Diff line number Diff line
@@ -316,7 +316,8 @@ in 
        ++ lib.optional config.services.colord.enable pkgs.colord-kde

        ++ lib.optional config.services.hardware.bolt.enable pkgs.plasma5Packages.plasma-thunderbolt

        ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ]

        ++ lib.optional config.services.xserver.wacom.enable pkgs.wacomtablet;

        ++ lib.optional config.services.xserver.wacom.enable pkgs.wacomtablet

        ++ lib.optional config.services.flatpak.enable flatpak-kcm;



      # Extra services for D-Bus activation

      services.dbus.packages = [

pkgs/applications/misc/maliit-framework/default.nix

+8 −0
Original line number Diff line number Diff line
@@ -33,6 +33,14 @@ mkDerivation rec { 
    sha256 = "sha256-q+hiupwlA0PfG+xtomCUp2zv6HQrGgmOd9CU193ucrY=";

  };



  patches = [

    # FIXME: backport GCC 12 build fix, remove for next release

    (fetchpatch {

      url = "https://github.com/maliit/framework/commit/86e55980e3025678882cb9c4c78614f86cdc1f04.diff";

      hash = "sha256-5R+sCI05vJX5epu6hcDSWWzlZ8ns1wKEJ+u8xC6d8Xo=";

    })

  ];



  buildInputs = [

    at-spi2-atk

    at-spi2-core

pkgs/desktops/lxqt/lxqt-config/default.nix

+12 −0
Original line number Diff line number Diff line 
{ lib

, mkDerivation

, fetchFromGitHub

, fetchpatch

, cmake

, pkg-config

, glib
@@ -29,6 +30,17 @@ mkDerivation rec { 
    sha256 = "WgrcHM4iJLZsJO2obqSkjHHMB+/kcadQArkcXC5FB24=";

  };



  patches = [

    # FIXME: backport Plasma 5.27 build fix, remove for next release

    (fetchpatch {

      url = "https://github.com/lxqt/lxqt-config/commit/6add4e4f0040693e7c4242fbae48c9d32007686c.diff";

      hash = "sha256-Tir4KeGhBnD9dYmB1FAjuf4R4V+rn12MOxsRwTdE0Sc=";

    })

  ];



  # FIXME: required to build with Plasma 5.27, which uses std::optional

  cmakeFlags = ["-DCMAKE_CXX_STANDARD=17"];



  nativeBuildInputs = [

    cmake

    pkg-config

pkgs/desktops/plasma-5/default.nix

+7 −4
Original line number Diff line number Diff line
@@ -51,9 +51,9 @@ let 
    mirror = "mirror://kde";

  };



  mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) { };

  qtStdenv = libsForQt5.callPackage ({ stdenv }: stdenv) {};



  packages = self: with self;

  packages = self:

    let



      propagate = out:
@@ -98,6 +98,7 @@ let 


            defaultSetupHook = if hasBin && hasDev then propagateBin else null;

            setupHook = args.setupHook or defaultSetupHook;

            nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ libsForQt5.wrapQtAppsHook ];



            meta =

              let meta = args.meta or { }; in
@@ -109,8 +110,8 @@ let 
                broken = meta.broken or broken;

              };

          in

          mkDerivation (args // {

            inherit pname version meta outputs setupHook src;

          (args.stdenv or qtStdenv).mkDerivation (args // {

            inherit pname version meta outputs setupHook src nativeBuildInputs;

          });

      };
@@ -123,6 +124,7 @@ let 
      breeze-grub = callPackage ./breeze-grub.nix { };

      breeze-plymouth = callPackage ./breeze-plymouth { };

      discover = callPackage ./discover.nix { };

      flatpak-kcm = callPackage ./flatpak-kcm.nix { };

      kactivitymanagerd = callPackage ./kactivitymanagerd.nix { };

      kde-cli-tools = callPackage ./kde-cli-tools.nix { };

      kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings-desktop-schemas; };
@@ -162,6 +164,7 @@ let 
      plasma-systemmonitor = callPackage ./plasma-systemmonitor.nix { };

      plasma-thunderbolt = callPackage ./plasma-thunderbolt.nix { };

      plasma-vault = callPackage ./plasma-vault { };

      plasma-welcome = callPackage ./plasma-welcome.nix { };

      plasma-workspace = callPackage ./plasma-workspace { };

      plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix { };

      polkit-kde-agent = callPackage ./polkit-kde-agent.nix { };